From: Nicki Křížek Date: Tue, 28 Jul 2026 17:15:05 +0000 (+0000) Subject: Use tabs for indentation in system test named configs X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebadaf05304a276b192e67559d2f6d28d97b11d7;p=thirdparty%2Fbind9.git Use tabs for indentation in system test named configs The system test named configs indented blocks with a mix of tabs, spaces, and tab/space combinations. Reindent the space-indented lines to one tab per block level to make the style uniform across all tests. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/_common/zones.conf.j2 b/bin/tests/system/_common/zones.conf.j2 index bf4a58b698d..edfe0713fc2 100644 --- a/bin/tests/system/_common/zones.conf.j2 +++ b/bin/tests/system/_common/zones.conf.j2 @@ -4,7 +4,7 @@ zone "@zone.name@" { type @zone.type@; {% if zone.type == "static-stub" %} - server-addresses { @zone.ns.ip@; }; + server-addresses { @zone.ns.ip@; }; {% else %} file "@zone.filepath@"; {% endif %} diff --git a/bin/tests/system/additional/ns1/named.conf.j2 b/bin/tests/system/additional/ns1/named.conf.j2 index 263cf03478e..cbaa9d9a51d 100644 --- a/bin/tests/system/additional/ns1/named.conf.j2 +++ b/bin/tests/system/additional/ns1/named.conf.j2 @@ -9,8 +9,8 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; zone "rt.example" { diff --git a/bin/tests/system/additional/ns1/named2.conf.j2 b/bin/tests/system/additional/ns1/named2.conf.j2 index 1184bc986f4..06a6d045e1b 100644 --- a/bin/tests/system/additional/ns1/named2.conf.j2 +++ b/bin/tests/system/additional/ns1/named2.conf.j2 @@ -9,8 +9,8 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; zone "rt.example" { diff --git a/bin/tests/system/additional/ns1/named3.conf.j2 b/bin/tests/system/additional/ns1/named3.conf.j2 index c16e82eebc1..84433f5ae69 100644 --- a/bin/tests/system/additional/ns1/named3.conf.j2 +++ b/bin/tests/system/additional/ns1/named3.conf.j2 @@ -10,8 +10,8 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; zone "rt.example" { diff --git a/bin/tests/system/additional/ns1/named4.conf.j2 b/bin/tests/system/additional/ns1/named4.conf.j2 index 6a0c8c4b80d..bd108a80e39 100644 --- a/bin/tests/system/additional/ns1/named4.conf.j2 +++ b/bin/tests/system/additional/ns1/named4.conf.j2 @@ -9,8 +9,8 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; zone "mx.example" { diff --git a/bin/tests/system/allow_query/ns3/named5.conf.j2 b/bin/tests/system/allow_query/ns3/named5.conf.j2 index 396f10672d1..804c16dc425 100644 --- a/bin/tests/system/allow_query/ns3/named5.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named5.conf.j2 @@ -11,9 +11,9 @@ options { {% include "_common/controls.conf.j2" %} view internal { - match-destinations { @ns.ip@; }; - {% include_indented "_common/root.hint.conf" %} + match-destinations { @ns.ip@; }; + {% include_indented "_common/root.hint.conf" %} - recursion yes; - allow-recursion { any; }; + recursion yes; + allow-recursion { any; }; }; diff --git a/bin/tests/system/allow_query/ns3/named6.conf.j2 b/bin/tests/system/allow_query/ns3/named6.conf.j2 index a25f076c885..3aaa881b18d 100644 --- a/bin/tests/system/allow_query/ns3/named6.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named6.conf.j2 @@ -8,8 +8,8 @@ options { {% include "_common/controls.conf.j2" %} view internal { - match-destinations { @ns.ip@; }; - {% include_indented "_common/root.hint.conf" %} - recursion yes; + match-destinations { @ns.ip@; }; + {% include_indented "_common/root.hint.conf" %} + recursion yes; allow-recursion{ any; }; }; diff --git a/bin/tests/system/allow_query/ns3/named7.conf.j2 b/bin/tests/system/allow_query/ns3/named7.conf.j2 index 569a3a72de8..726b8fea630 100644 --- a/bin/tests/system/allow_query/ns3/named7.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named7.conf.j2 @@ -8,8 +8,8 @@ options { {% include "_common/controls.conf.j2" %} view internal { - match-destinations { @ns.ip@; }; - {% include_indented "_common/root.hint.conf" %} - recursion yes; + match-destinations { @ns.ip@; }; + {% include_indented "_common/root.hint.conf" %} + recursion yes; allow-query{ any; }; }; diff --git a/bin/tests/system/allow_query/ns3/named8.conf.j2 b/bin/tests/system/allow_query/ns3/named8.conf.j2 index 374bb7b025c..61103ba3b21 100644 --- a/bin/tests/system/allow_query/ns3/named8.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named8.conf.j2 @@ -13,7 +13,7 @@ options { view internal { {% include_indented "_common/root.hint.conf" %} - recursion yes; - allow-query-cache { @ns.ip@; 10.53.0.4; }; + recursion yes; + allow-query-cache { @ns.ip@; 10.53.0.4; }; allow-query { 10.53.0.4; }; }; diff --git a/bin/tests/system/catz/ns1/named.conf.j2 b/bin/tests/system/catz/ns1/named.conf.j2 index da7593d06d7..b552e718742 100644 --- a/bin/tests/system/catz/ns1/named.conf.j2 +++ b/bin/tests/system/catz/ns1/named.conf.j2 @@ -147,6 +147,6 @@ key next_key. { }; key longlonglongname0123456789abcdef. { - secret "LaAnCU+Z"; - algorithm @DEFAULT_HMAC@; + secret "LaAnCU+Z"; + algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/catz/ns2/named.conf.j2 b/bin/tests/system/catz/ns2/named.conf.j2 index 850b4af9499..e21476e0e2b 100644 --- a/bin/tests/system/catz/ns2/named.conf.j2 +++ b/bin/tests/system/catz/ns2/named.conf.j2 @@ -95,20 +95,20 @@ view "default" { {% endif %} zone "dom-existing.example" { - type primary; - file "dom-existing.example.db"; + type primary; + file "dom-existing.example.db"; }; zone "dom-existing-forward.example" { - type forward; - forward only; - forwarders { 10.53.0.1; }; + type forward; + forward only; + forwarders { 10.53.0.1; }; }; zone "dom-existing-forward-off.example" { - type forward; - forward only; - forwarders { }; + type forward; + forward only; + forwarders { }; }; zone "catalog0.example" { @@ -154,8 +154,8 @@ view "default" { # to deal with that situation (see GL #3911). Make sure that this duplicate # zone comes after the the "catalog1.example" zone in the configuration file. zone "dom3.example" { - type secondary; - file "dom2.example.db"; + type secondary; + file "dom2.example.db"; }; {% endif %} diff --git a/bin/tests/system/catz/ns2/named7.conf.j2 b/bin/tests/system/catz/ns2/named7.conf.j2 index 2f9be47d171..11cfec649ac 100644 --- a/bin/tests/system/catz/ns2/named7.conf.j2 +++ b/bin/tests/system/catz/ns2/named7.conf.j2 @@ -16,20 +16,20 @@ view "default" { # identical to named1.conf.in zone "dom-existing.example" { - type primary; - file "dom-existing.example.db"; + type primary; + file "dom-existing.example.db"; }; zone "dom-existing-forward.example" { - type forward; - forward only; - forwarders { 10.53.0.1; }; + type forward; + forward only; + forwarders { 10.53.0.1; }; }; zone "dom-existing-forward-off.example" { - type forward; - forward only; - forwarders { }; + type forward; + forward only; + forwarders { }; }; zone "catalog0.example" { diff --git a/bin/tests/system/checkconf/bad-catz-zone-primary-dup.conf b/bin/tests/system/checkconf/bad-catz-zone-primary-dup.conf index ce0c8e9311d..8d8b000cdb2 100644 --- a/bin/tests/system/checkconf/bad-catz-zone-primary-dup.conf +++ b/bin/tests/system/checkconf/bad-catz-zone-primary-dup.conf @@ -8,7 +8,7 @@ options { }; zone "catalog.example" { - type secondary; - file "catalog.example.db"; - primaries { 10.53.0.1; }; + type secondary; + file "catalog.example.db"; + primaries { 10.53.0.1; }; }; diff --git a/bin/tests/system/checkconf/bad-controls-duplicate.conf b/bin/tests/system/checkconf/bad-controls-duplicate.conf index a62c9ab643a..51968ac7a45 100644 --- a/bin/tests/system/checkconf/bad-controls-duplicate.conf +++ b/bin/tests/system/checkconf/bad-controls-duplicate.conf @@ -1,11 +1,11 @@ key rndc-key { algorithm "hmac-sha256"; - secret "xxxxxxxxxxxxxxxxxxxxxxxx"; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; key ddns-key { algorithm "hmac-sha256"; - secret "yyyyyyyyyyyyyyyyyyyyyyyy"; + secret "yyyyyyyyyyyyyyyyyyyyyyyy"; }; controls { diff --git a/bin/tests/system/checkconf/bad-inline-secondary.conf b/bin/tests/system/checkconf/bad-inline-secondary.conf index 08c49b952ef..0be57280d4c 100644 --- a/bin/tests/system/checkconf/bad-inline-secondary.conf +++ b/bin/tests/system/checkconf/bad-inline-secondary.conf @@ -1,9 +1,9 @@ - /* - * An inline-signing secondary should be forced to have a file option - */ +/* + * An inline-signing secondary should be forced to have a file option + */ - zone "." { - type secondary; - inline-signing yes; - primaries { 10.53.0.1; }; - }; +zone "." { + type secondary; + inline-signing yes; + primaries { 10.53.0.1; }; +}; diff --git a/bin/tests/system/checkconf/bad-journalsize.conf b/bin/tests/system/checkconf/bad-journalsize.conf index 4a98c89e7c6..5116cb46fc9 100644 --- a/bin/tests/system/checkconf/bad-journalsize.conf +++ b/bin/tests/system/checkconf/bad-journalsize.conf @@ -1,6 +1,6 @@ zone "clone" { - type secondary; - primaries { ::1; }; - file "xxx"; - max-journal-size 3g; + type secondary; + primaries { ::1; }; + file "xxx"; + max-journal-size 3g; }; diff --git a/bin/tests/system/checkconf/bad-kasp-max-zone-ttl.conf b/bin/tests/system/checkconf/bad-kasp-max-zone-ttl.conf index 191d4a3815a..2c80e3df243 100644 --- a/bin/tests/system/checkconf/bad-kasp-max-zone-ttl.conf +++ b/bin/tests/system/checkconf/bad-kasp-max-zone-ttl.conf @@ -9,5 +9,5 @@ options { zone "example.net" { type primary; file "example.db"; - max-zone-ttl 600; + max-zone-ttl 600; }; diff --git a/bin/tests/system/checkconf/bad-mirror-zonename.conf b/bin/tests/system/checkconf/bad-mirror-zonename.conf index 3c4663ec697..e6c499e29d4 100644 --- a/bin/tests/system/checkconf/bad-mirror-zonename.conf +++ b/bin/tests/system/checkconf/bad-mirror-zonename.conf @@ -1,4 +1,4 @@ zone "\0example" { - type mirror; - file "example.db"; + type mirror; + file "example.db"; }; diff --git a/bin/tests/system/checkconf/bad-options-query-source-address-v4-v6.conf b/bin/tests/system/checkconf/bad-options-query-source-address-v4-v6.conf index 92a584a20a9..df1ccef93b3 100644 --- a/bin/tests/system/checkconf/bad-options-query-source-address-v4-v6.conf +++ b/bin/tests/system/checkconf/bad-options-query-source-address-v4-v6.conf @@ -1,4 +1,4 @@ options { - query-source none; - query-source-v6 none; + query-source none; + query-source-v6 none; }; diff --git a/bin/tests/system/checkconf/bad-parental-agents-def-view2.conf b/bin/tests/system/checkconf/bad-parental-agents-def-view2.conf index a42cfabbe26..e6292d41030 100644 --- a/bin/tests/system/checkconf/bad-parental-agents-def-view2.conf +++ b/bin/tests/system/checkconf/bad-parental-agents-def-view2.conf @@ -1,7 +1,7 @@ view "test" { remote-servers "net" { 192.168.1.2; - }; + }; zone "example.net" { type primary; file "example.net.db"; diff --git a/bin/tests/system/checkconf/bad-primaries-key.conf b/bin/tests/system/checkconf/bad-primaries-key.conf index 5bd631f3d69..49ca413a504 100644 --- a/bin/tests/system/checkconf/bad-primaries-key.conf +++ b/bin/tests/system/checkconf/bad-primaries-key.conf @@ -1,4 +1,4 @@ zone example { - type secondary; - primaries { 1.2.3.4 key a..b; }; + type secondary; + primaries { 1.2.3.4 key a..b; }; }; diff --git a/bin/tests/system/checkconf/bad-primaries-notfound.conf b/bin/tests/system/checkconf/bad-primaries-notfound.conf index a8e8d7ce7f1..d6cd1042641 100644 --- a/bin/tests/system/checkconf/bad-primaries-notfound.conf +++ b/bin/tests/system/checkconf/bad-primaries-notfound.conf @@ -1,5 +1,5 @@ remote-servers "net" { - 192.168.1.2; + 192.168.1.2; }; zone "example.net" { diff --git a/bin/tests/system/checkconf/bad-primaries-tls.conf b/bin/tests/system/checkconf/bad-primaries-tls.conf index e11982db10d..1a8e1ac9bd4 100644 --- a/bin/tests/system/checkconf/bad-primaries-tls.conf +++ b/bin/tests/system/checkconf/bad-primaries-tls.conf @@ -1,4 +1,4 @@ zone example { - type secondary; - primaries { 1.2.3.4 tls a..b; }; + type secondary; + primaries { 1.2.3.4 tls a..b; }; }; diff --git a/bin/tests/system/checkconf/bad-query-source-address-v4-none.conf b/bin/tests/system/checkconf/bad-query-source-address-v4-none.conf index 1e1dd5e03ee..9d59fb0b289 100644 --- a/bin/tests/system/checkconf/bad-query-source-address-v4-none.conf +++ b/bin/tests/system/checkconf/bad-query-source-address-v4-none.conf @@ -1,3 +1,3 @@ server 1.2.3.4 { - query-source none; + query-source none; }; diff --git a/bin/tests/system/checkconf/bad-query-source-address-v6-none.conf b/bin/tests/system/checkconf/bad-query-source-address-v6-none.conf index 3e7236c761b..476fc414c00 100644 --- a/bin/tests/system/checkconf/bad-query-source-address-v6-none.conf +++ b/bin/tests/system/checkconf/bad-query-source-address-v6-none.conf @@ -1,3 +1,3 @@ server fd92:7065:b8e:ffff::1 { - query-source-v6 none; + query-source-v6 none; }; diff --git a/bin/tests/system/checkconf/bad-rad2.conf b/bin/tests/system/checkconf/bad-rad2.conf index a94a730c34a..595791d3852 100644 --- a/bin/tests/system/checkconf/bad-rad2.conf +++ b/bin/tests/system/checkconf/bad-rad2.conf @@ -1,6 +1,6 @@ zone example.com { - type primary; - file "example.db"; + type primary; + file "example.db"; /* agent-domain can't be the same as the zone name */ send-report-channel example.com; diff --git a/bin/tests/system/checkconf/bad-rad3.conf b/bin/tests/system/checkconf/bad-rad3.conf index 99f7be2c808..8d0485d0b00 100644 --- a/bin/tests/system/checkconf/bad-rad3.conf +++ b/bin/tests/system/checkconf/bad-rad3.conf @@ -1,6 +1,6 @@ zone example.com { - type primary; - file "example.db"; + type primary; + file "example.db"; /* agent-domain can't be the below the zone name */ send-report-channel sub.example.com; diff --git a/bin/tests/system/checkconf/bad-random-device.conf b/bin/tests/system/checkconf/bad-random-device.conf index 7c14f46ece6..6e8fb691c32 100644 --- a/bin/tests/system/checkconf/bad-random-device.conf +++ b/bin/tests/system/checkconf/bad-random-device.conf @@ -1,3 +1,3 @@ options { - random-device "/dev/urandom"; + random-device "/dev/urandom"; }; diff --git a/bin/tests/system/checkconf/bad-rrl-table-size.conf b/bin/tests/system/checkconf/bad-rrl-table-size.conf index e8508a85468..4e180d734ea 100644 --- a/bin/tests/system/checkconf/bad-rrl-table-size.conf +++ b/bin/tests/system/checkconf/bad-rrl-table-size.conf @@ -1,12 +1,12 @@ options { rate-limit { - responses-per-second 2; - all-per-second 50; - slip 3; - exempt-clients { 10.53.0.7; }; - log-only yes; + responses-per-second 2; + all-per-second 50; + slip 3; + exempt-clients { 10.53.0.7; }; + log-only yes; - min-table-size 0; - max-table-size 0; + min-table-size 0; + max-table-size 0; }; }; diff --git a/bin/tests/system/checkconf/bad-static-initial-2.conf b/bin/tests/system/checkconf/bad-static-initial-2.conf index 7a566d4eed3..ba8e32a45e3 100644 --- a/bin/tests/system/checkconf/bad-static-initial-2.conf +++ b/bin/tests/system/checkconf/bad-static-initial-2.conf @@ -1,4 +1,4 @@ trust-anchors { example. initial-ds 60724 5 1 "D74CF845955A0DFE604AF215E948E67D2EA94FF3"; - example. static-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; + example. static-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; }; diff --git a/bin/tests/system/checkconf/bad-static-initial-3.conf b/bin/tests/system/checkconf/bad-static-initial-3.conf index 7209cc6d4d6..97d45c328b5 100644 --- a/bin/tests/system/checkconf/bad-static-initial-3.conf +++ b/bin/tests/system/checkconf/bad-static-initial-3.conf @@ -1,4 +1,4 @@ trust-anchors { example. static-ds 60724 5 1 "D74CF845955A0DFE604AF215E948E67D2EA94FF3"; - example. initial-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; + example. initial-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; }; diff --git a/bin/tests/system/checkconf/bad-static-initial-4.conf b/bin/tests/system/checkconf/bad-static-initial-4.conf index ff26465f108..6e0be8c6db6 100644 --- a/bin/tests/system/checkconf/bad-static-initial-4.conf +++ b/bin/tests/system/checkconf/bad-static-initial-4.conf @@ -1,4 +1,4 @@ trust-anchors { - example. initial-key 257 3 5 "AwEAAawvFp8GlBx8Qt6yaIqXkDe+nMkSk2HkTAG7qlVBo++AQwZ1j3Xl25IN4jsw0VTMbKUbafw9DYsVzztIwx1sNkKRLo6qP9SSkBL8RicQaafGtURtsYI3oqte5qqLve1CUpRD8J06Pg1xkOxsDlz9sQAyiQrOyvMbykJYkYrFYGLzYAgl/JtMyVVYlBl9pqxQuAPKYPOuO1axaad/wLN3+wTy/hcJfpvJpqzXlDF9bI5RmpoX/7geZ06vpcYJEoT0xkkmPlEl0ZjEDrm/WIaSWG0/CEDpHcOXFz4OEczMVpY+lnuFfKybwF1WHFn2BwVEOS6cMM6ukIjINQyrszHhWUU="; - example. static-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; + example. initial-key 257 3 5 "AwEAAawvFp8GlBx8Qt6yaIqXkDe+nMkSk2HkTAG7qlVBo++AQwZ1j3Xl25IN4jsw0VTMbKUbafw9DYsVzztIwx1sNkKRLo6qP9SSkBL8RicQaafGtURtsYI3oqte5qqLve1CUpRD8J06Pg1xkOxsDlz9sQAyiQrOyvMbykJYkYrFYGLzYAgl/JtMyVVYlBl9pqxQuAPKYPOuO1axaad/wLN3+wTy/hcJfpvJpqzXlDF9bI5RmpoX/7geZ06vpcYJEoT0xkkmPlEl0ZjEDrm/WIaSWG0/CEDpHcOXFz4OEczMVpY+lnuFfKybwF1WHFn2BwVEOS6cMM6ukIjINQyrszHhWUU="; + example. static-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; }; diff --git a/bin/tests/system/checkconf/bad-template-file-reuse.conf b/bin/tests/system/checkconf/bad-template-file-reuse.conf index 2887071dbc3..2d89d5f5e68 100644 --- a/bin/tests/system/checkconf/bad-template-file-reuse.conf +++ b/bin/tests/system/checkconf/bad-template-file-reuse.conf @@ -1,6 +1,6 @@ template a { type secondary; - primaries { 192.0.0.2; }; + primaries { 192.0.0.2; }; file "$name.db"; }; @@ -10,6 +10,6 @@ zone example { zone other { type secondary; - primaries { 192.0.0.2; }; - file "example.db"; + primaries { 192.0.0.2; }; + file "example.db"; }; diff --git a/bin/tests/system/checkconf/bad-transfersize-1.conf b/bin/tests/system/checkconf/bad-transfersize-1.conf index 8f68c2d7c2a..da3afe9b15d 100644 --- a/bin/tests/system/checkconf/bad-transfersize-1.conf +++ b/bin/tests/system/checkconf/bad-transfersize-1.conf @@ -1,6 +1,6 @@ zone "clone" { - type secondary; - primaries { ::1; }; - file "xxx"; - min-transfer-rate-in 0 28800; + type secondary; + primaries { ::1; }; + file "xxx"; + min-transfer-rate-in 0 28800; }; diff --git a/bin/tests/system/checkconf/bad-transfersize-2.conf b/bin/tests/system/checkconf/bad-transfersize-2.conf index 9f43fb4bf65..30fe67748ab 100644 --- a/bin/tests/system/checkconf/bad-transfersize-2.conf +++ b/bin/tests/system/checkconf/bad-transfersize-2.conf @@ -1,6 +1,6 @@ zone "clone" { - type secondary; - primaries { ::1; }; - file "xxx"; - min-transfer-rate-in 1024 65536; + type secondary; + primaries { ::1; }; + file "xxx"; + min-transfer-rate-in 1024 65536; }; diff --git a/bin/tests/system/checkconf/check-dup-records-fail.conf b/bin/tests/system/checkconf/check-dup-records-fail.conf index ec97ad563fb..8cd7a762c78 100644 --- a/bin/tests/system/checkconf/check-dup-records-fail.conf +++ b/bin/tests/system/checkconf/check-dup-records-fail.conf @@ -1,10 +1,10 @@ options { - check-integrity yes; // default is yes + check-integrity yes; // default is yes }; zone "check-dup-records" { - type primary; - file "check-dup-records.db"; - check-dup-records fail; + type primary; + file "check-dup-records.db"; + check-dup-records fail; }; diff --git a/bin/tests/system/checkconf/check-mx-cname-fail.conf b/bin/tests/system/checkconf/check-mx-cname-fail.conf index 0e2da710338..e144e380f74 100644 --- a/bin/tests/system/checkconf/check-mx-cname-fail.conf +++ b/bin/tests/system/checkconf/check-mx-cname-fail.conf @@ -1,9 +1,9 @@ options { - check-integrity yes; // default is yes + check-integrity yes; // default is yes }; zone "check-mx-cname" { - type primary; - file "check-mx-cname.db"; - check-mx-cname fail; + type primary; + file "check-mx-cname.db"; + check-mx-cname fail; }; diff --git a/bin/tests/system/checkconf/check-mx-fail.conf b/bin/tests/system/checkconf/check-mx-fail.conf index 1143146b858..4c0541040ec 100644 --- a/bin/tests/system/checkconf/check-mx-fail.conf +++ b/bin/tests/system/checkconf/check-mx-fail.conf @@ -1,9 +1,9 @@ options { - check-integrity yes; // default is yes + check-integrity yes; // default is yes }; zone "check-mx" { - type primary; - file "check-mx.db"; - check-mx fail; + type primary; + file "check-mx.db"; + check-mx fail; }; diff --git a/bin/tests/system/checkconf/check-names-fail.conf b/bin/tests/system/checkconf/check-names-fail.conf index 9c999ad3f8a..69b86248e70 100644 --- a/bin/tests/system/checkconf/check-names-fail.conf +++ b/bin/tests/system/checkconf/check-names-fail.conf @@ -1,9 +1,9 @@ options { - check-integrity yes; // default is yes + check-integrity yes; // default is yes }; zone "check-names" { - type primary; - file "check-names.db"; - check-names fail; + type primary; + file "check-names.db"; + check-names fail; }; diff --git a/bin/tests/system/checkconf/check-root-static-ds.conf b/bin/tests/system/checkconf/check-root-static-ds.conf index 7472ddd81a3..da2225fe302 100644 --- a/bin/tests/system/checkconf/check-root-static-ds.conf +++ b/bin/tests/system/checkconf/check-root-static-ds.conf @@ -1,3 +1,3 @@ trust-anchors { - . static-ds 20326 8 2 "E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D"; + . static-ds 20326 8 2 "E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D"; }; diff --git a/bin/tests/system/checkconf/check-srv-cname-fail.conf b/bin/tests/system/checkconf/check-srv-cname-fail.conf index a5b7f39ab73..9cb8c4f329a 100644 --- a/bin/tests/system/checkconf/check-srv-cname-fail.conf +++ b/bin/tests/system/checkconf/check-srv-cname-fail.conf @@ -1,9 +1,9 @@ options { - check-integrity yes; // default is yes + check-integrity yes; // default is yes }; zone "check-srv-cname" { - type primary; - file "check-srv-cname.db"; - check-srv-cname fail; + type primary; + file "check-srv-cname.db"; + check-srv-cname fail; }; diff --git a/bin/tests/system/checkconf/check-wildcard-no.conf b/bin/tests/system/checkconf/check-wildcard-no.conf index a5a9ac9a83c..3f65d6aa5c5 100644 --- a/bin/tests/system/checkconf/check-wildcard-no.conf +++ b/bin/tests/system/checkconf/check-wildcard-no.conf @@ -1,5 +1,5 @@ zone "check-wildcard" { - type primary; - file "check-wildcard.db"; - check-wildcard no; + type primary; + file "check-wildcard.db"; + check-wildcard no; }; diff --git a/bin/tests/system/checkconf/check-wildcard.conf b/bin/tests/system/checkconf/check-wildcard.conf index c35f82686e8..8c091d01c31 100644 --- a/bin/tests/system/checkconf/check-wildcard.conf +++ b/bin/tests/system/checkconf/check-wildcard.conf @@ -1,5 +1,5 @@ zone "check-wildcard" { - type primary; - file "check-wildcard.db"; - check-wildcard yes; + type primary; + file "check-wildcard.db"; + check-wildcard yes; }; diff --git a/bin/tests/system/checkconf/good-dot-doh-tls-nokeycert.conf b/bin/tests/system/checkconf/good-dot-doh-tls-nokeycert.conf index 9a28f584302..8dd4913533c 100644 --- a/bin/tests/system/checkconf/good-dot-doh-tls-nokeycert.conf +++ b/bin/tests/system/checkconf/good-dot-doh-tls-nokeycert.conf @@ -1,5 +1,5 @@ # In some cases a "tls" statement may omit key-file and cert-file. tls local-tls { - protocols {TLSv1.2;}; - remote-hostname "fqdn.example.com"; + protocols {TLSv1.2;}; + remote-hostname "fqdn.example.com"; }; diff --git a/bin/tests/system/checkconf/good-ds-key-1.conf b/bin/tests/system/checkconf/good-ds-key-1.conf index 3c0760f9dd9..e381335898a 100644 --- a/bin/tests/system/checkconf/good-ds-key-1.conf +++ b/bin/tests/system/checkconf/good-ds-key-1.conf @@ -1,4 +1,4 @@ trust-anchors { example. initial-ds 60724 5 1 "D74CF845955A0DFE604AF215E948E67D2EA94FF3"; - example. initial-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; + example. initial-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; }; diff --git a/bin/tests/system/checkconf/good-ds-key-2.conf b/bin/tests/system/checkconf/good-ds-key-2.conf index 686ec14deda..2df28550b69 100644 --- a/bin/tests/system/checkconf/good-ds-key-2.conf +++ b/bin/tests/system/checkconf/good-ds-key-2.conf @@ -1,4 +1,4 @@ trust-anchors { example. static-ds 60724 5 1 "D74CF845955A0DFE604AF215E948E67D2EA94FF3"; - example. static-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; + example. static-key 257 3 5 "AwEAAZtP9+RAA+W33A97e+HnnH8WTXzCWiEICyWj1B6rvZ9hd50ysbody0NLx7b3vZ1bzMLxLSRAr/n3Wi0TDZ1fvCKZhennfW8Wlc7ulCvHntSQYfKHUP0YWEo84sQAqIi850N1aiddj6CidwFo9JNW/HQ+8yarfrnGMFhX2STtkE0hNJ/R6JYKmD2EH7k1nyqJd08ibrEt55DuV4BiUjyyERdVbsuwE60jVqAwCKyVBYXb2sI+zv1yPNDBIANd6KTgnq6YWzx5ZodQP3W4K7Z/Bk3EKmVCvrTKZK/ADLAKaL0/6DD07+1jXA4BiNyoZTLTapkudkGad+Rn6zqCkwuMmrU="; }; diff --git a/bin/tests/system/checkconf/good-key-directory.conf b/bin/tests/system/checkconf/good-key-directory.conf index 7cf565a8608..5bdca10ee31 100644 --- a/bin/tests/system/checkconf/good-key-directory.conf +++ b/bin/tests/system/checkconf/good-key-directory.conf @@ -1,57 +1,57 @@ dnssec-policy "internet" { - keys { - ksk key-directory lifetime unlimited algorithm ecdsa256; - zsk key-directory lifetime P90D algorithm ecdsa256; - }; + keys { + ksk key-directory lifetime unlimited algorithm ecdsa256; + zsk key-directory lifetime P90D algorithm ecdsa256; + }; - nsec3param iterations 0 optout no salt-length 8; + nsec3param iterations 0 optout no salt-length 8; }; dnssec-policy "intranet" { - keys { - ksk key-directory lifetime unlimited algorithm ecdsa256; - zsk key-directory lifetime P30D algorithm ecdsa256; - }; - nsec3param iterations 0 optout no salt-length 8; + keys { + ksk key-directory lifetime unlimited algorithm ecdsa256; + zsk key-directory lifetime P30D algorithm ecdsa256; + }; + nsec3param iterations 0 optout no salt-length 8; }; dnssec-policy "localhost" { - keys { - ksk key-directory lifetime unlimited algorithm ecdsa256; - zsk key-directory lifetime P30D algorithm ecdsa256; - }; - nsec3param iterations 0 optout no salt-length 8; + keys { + ksk key-directory lifetime unlimited algorithm ecdsa256; + zsk key-directory lifetime P30D algorithm ecdsa256; + }; + nsec3param iterations 0 optout no salt-length 8; }; options { - key-directory "global/keys"; + key-directory "global/keys"; }; view "localhost" { - match-clients { 127.0.0.1; ::1; }; - zone "example.com" IN { - type primary; - file "localhost/example.com.zone"; - dnssec-policy "localhost"; - }; + match-clients { 127.0.0.1; ::1; }; + zone "example.com" IN { + type primary; + file "localhost/example.com.zone"; + dnssec-policy "localhost"; + }; }; view "external" { - match-clients { 0/0; }; - key-directory "external/keys"; - zone "example.com" IN { - type primary; - file "external/example.com.zone"; - dnssec-policy "internet"; - }; + match-clients { 0/0; }; + key-directory "external/keys"; + zone "example.com" IN { + type primary; + file "external/example.com.zone"; + dnssec-policy "internet"; + }; }; view "internal" { - match-clients { ::/0; }; - key-directory "internal/keys"; - zone "example.com" IN { - type primary; - file "internal/example.com.zone"; - dnssec-policy "intranet"; - }; + match-clients { ::/0; }; + key-directory "internal/keys"; + zone "example.com" IN { + type primary; + file "internal/example.com.zone"; + dnssec-policy "intranet"; + }; }; diff --git a/bin/tests/system/checkconf/good-key-view.conf b/bin/tests/system/checkconf/good-key-view.conf index 303617c87ed..6aeadbf767f 100644 --- a/bin/tests/system/checkconf/good-key-view.conf +++ b/bin/tests/system/checkconf/good-key-view.conf @@ -1,14 +1,14 @@ view aview { key akey { - algorithm hmac-sha256; - secret "9999abcd8765"; + algorithm hmac-sha256; + secret "9999abcd8765"; }; zone "azone" { type secondary; - file "azone.db"; - primaries { - 1.2.3.4 key "akey"; - }; - }; + file "azone.db"; + primaries { + 1.2.3.4 key "akey"; + }; + }; }; diff --git a/bin/tests/system/checkconf/good-nonempty-trust-anchors.conf b/bin/tests/system/checkconf/good-nonempty-trust-anchors.conf index 475b6d04e36..4eebe7027f4 100644 --- a/bin/tests/system/checkconf/good-nonempty-trust-anchors.conf +++ b/bin/tests/system/checkconf/good-nonempty-trust-anchors.conf @@ -3,5 +3,5 @@ options { }; trust-anchors { - example. static-ds 60724 5 2 "29E79B9064EE1A11DF3BFF19581DDFED7952C22CC204ACE17B6007EB1437E9E6"; + example. static-ds 60724 5 2 "29E79B9064EE1A11DF3BFF19581DDFED7952C22CC204ACE17B6007EB1437E9E6"; }; diff --git a/bin/tests/system/checkconf/good-options-query-source-address-v4-none.conf b/bin/tests/system/checkconf/good-options-query-source-address-v4-none.conf index a6e5d7988fd..7f9d75bb51d 100644 --- a/bin/tests/system/checkconf/good-options-query-source-address-v4-none.conf +++ b/bin/tests/system/checkconf/good-options-query-source-address-v4-none.conf @@ -1,3 +1,3 @@ options { - query-source none; + query-source none; }; diff --git a/bin/tests/system/checkconf/good-options-query-source-address-v6-none.conf b/bin/tests/system/checkconf/good-options-query-source-address-v6-none.conf index e00e6ec093d..54ed81ac651 100644 --- a/bin/tests/system/checkconf/good-options-query-source-address-v6-none.conf +++ b/bin/tests/system/checkconf/good-options-query-source-address-v6-none.conf @@ -1,3 +1,3 @@ options { - query-source-v6 none; + query-source-v6 none; }; diff --git a/bin/tests/system/checkconf/good-remote-servers-named.conf b/bin/tests/system/checkconf/good-remote-servers-named.conf index 9fb093d3c46..5a51680a97e 100644 --- a/bin/tests/system/checkconf/good-remote-servers-named.conf +++ b/bin/tests/system/checkconf/good-remote-servers-named.conf @@ -1,6 +1,6 @@ key foo { - algorithm hmac-sha256; - secret "9999abcd8765"; + algorithm hmac-sha256; + secret "9999abcd8765"; }; tls bar { diff --git a/bin/tests/system/checkconf/good-template-file-reuse.conf b/bin/tests/system/checkconf/good-template-file-reuse.conf index 87886559e65..81aeb3f5e81 100644 --- a/bin/tests/system/checkconf/good-template-file-reuse.conf +++ b/bin/tests/system/checkconf/good-template-file-reuse.conf @@ -1,6 +1,6 @@ template a { type secondary; - primaries { 192.0.0.2; }; + primaries { 192.0.0.2; }; file "$name.db"; }; diff --git a/bin/tests/system/class/ns2/named.conf.j2 b/bin/tests/system/class/ns2/named.conf.j2 index d5e7a78c5e4..231cbdb5d32 100644 --- a/bin/tests/system/class/ns2/named.conf.j2 +++ b/bin/tests/system/class/ns2/named.conf.j2 @@ -7,7 +7,7 @@ options { view default { match-clients { any; }; recursion no; - dnssec-validation no; + dnssec-validation no; zone "1.0.0.127.in-addr.arpa." { type primary; file "localhost.db"; diff --git a/bin/tests/system/cookie/ns1/named.conf.j2 b/bin/tests/system/cookie/ns1/named.conf.j2 index 3f7ff3bc508..3a3122fa347 100644 --- a/bin/tests/system/cookie/ns1/named.conf.j2 +++ b/bin/tests/system/cookie/ns1/named.conf.j2 @@ -13,10 +13,12 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } - except-from { "example.org"; }; + except-from { "example.org"; }; deny-answer-aliases { "example.org"; } - except-from { "goodcname.example.net"; - "gooddname.example.net"; }; + except-from { + "goodcname.example.net"; + "gooddname.example.net"; + }; allow-query {!10.53.0.8; any; }; send-cookie yes; nocookie-udp-size 512; diff --git a/bin/tests/system/cookie/ns3/named.conf.j2 b/bin/tests/system/cookie/ns3/named.conf.j2 index 12a05a28e22..96d0cbf769c 100644 --- a/bin/tests/system/cookie/ns3/named.conf.j2 +++ b/bin/tests/system/cookie/ns3/named.conf.j2 @@ -4,10 +4,12 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } - except-from { "example.org"; }; + except-from { "example.org"; }; deny-answer-aliases { "example.org"; } - except-from { "goodcname.example.net"; - "gooddname.example.net"; }; + except-from { + "goodcname.example.net"; + "gooddname.example.net"; + }; allow-query {!10.53.0.8; any; }; send-cookie yes; nocookie-udp-size 512; diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.j2 b/bin/tests/system/dlzexternal/ns1/named.conf.j2 index 129246b6bfd..bc41cee6536 100644 --- a/bin/tests/system/dlzexternal/ns1/named.conf.j2 +++ b/bin/tests/system/dlzexternal/ns1/named.conf.j2 @@ -27,7 +27,7 @@ dlz "example three" { dlz "example four" { // Long zone name to trigger ISC_R_NOSPACE in dns_sdlz_putrr. - database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ 123456789.123456789.123456789.123456789.123456789.example.foo"; + database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ 123456789.123456789.123456789.123456789.123456789.example.foo"; }; dlz "unsearched1" { diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2 index 126856fd4ac..c55decc41ae 100644 --- a/bin/tests/system/dnssec/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec/ns3/named.conf.j2 @@ -420,18 +420,18 @@ zone "rsasha1-1024.example" { }; zone "rsasha256oid.example" { - type primary; - file "rsasha256oid.example.db.signed"; + type primary; + file "rsasha256oid.example.db.signed"; }; zone "rsasha512oid.example" { - type primary; - file "rsasha512oid.example.db.signed"; + type primary; + file "rsasha512oid.example.db.signed"; }; zone "unknownoid.example" { - type primary; - file "unknownoid.example.db.signed"; + type primary; + file "unknownoid.example.db.signed"; }; zone "target.peer-ns-spoof" { @@ -440,18 +440,18 @@ zone "target.peer-ns-spoof" { }; zone "extradsoid.example" { - type primary; - file "extradsoid.example.db.signed"; + type primary; + file "extradsoid.example.db.signed"; }; zone "extradsunknownoid.example" { - type primary; - file "extradsunknownoid.example.db.signed"; + type primary; + file "extradsunknownoid.example.db.signed"; }; zone "extended-ds-unknown-oid.example" { - type primary; - file "extended-ds-unknown-oid.example.db.signed"; + type primary; + file "extended-ds-unknown-oid.example.db.signed"; }; dnssec-policy "siginterval" { diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 index 811dd8a2347..d776d334a02 100644 --- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 @@ -13,12 +13,12 @@ options { {% if PARENT_DNSKEY is defined and PARENT_DNSKEY|length %} zone "f045.test" { - type static-stub; - server-addresses { 10.53.0.1; }; + type static-stub; + server-addresses { 10.53.0.1; }; }; trust-anchors { - f045.test. static-key 257 3 13 "@PARENT_DNSKEY@"; + f045.test. static-key 257 3 13 "@PARENT_DNSKEY@"; }; {% else %} zone "f043.test" { diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2 index 090a45765e7..1b60099f95e 100644 --- a/bin/tests/system/doth/ns2/named.conf.j2 +++ b/bin/tests/system/doth/ns2/named.conf.j2 @@ -146,7 +146,7 @@ zone "example8" { }; tls tls-example-primary-mutual-tls { - remote-hostname "srv01.crt01.example.com"; + remote-hostname "srv01.crt01.example.com"; ca-file "../CA/CA.pem"; cert-file "../CA/certs/srv01.client02-ns2.example.com.pem"; key-file "../CA/certs/srv01.client02-ns2.example.com.key"; @@ -167,7 +167,7 @@ zone "example10" { }; tls tls-example-primary-mutual-tls-expired { - remote-hostname "srv01.crt01.example.com"; + remote-hostname "srv01.crt01.example.com"; ca-file "../CA/CA.pem"; cert-file "../CA/certs/srv01.client03-ns2-expired.example.com.pem"; key-file "../CA/certs/srv01.client03-ns2-expired.example.com.key"; diff --git a/bin/tests/system/emptyzones/ns1/named.conf.j2 b/bin/tests/system/emptyzones/ns1/named.conf.j2 index 0fc5fff6351..80cb6cd97f3 100644 --- a/bin/tests/system/emptyzones/ns1/named.conf.j2 +++ b/bin/tests/system/emptyzones/ns1/named.conf.j2 @@ -4,10 +4,12 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } - except-from { "example.org"; }; + except-from { "example.org"; }; deny-answer-aliases { "example.org"; } - except-from { "goodcname.example.net"; - "gooddname.example.net"; }; + except-from { + "goodcname.example.net"; + "gooddname.example.net"; + }; allow-query {!10.53.0.8; any; }; allow-transfer { none; }; }; diff --git a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 b/bin/tests/system/enginepkcs11/ns2/named.conf.j2 index 672812d87d0..c163e74dc84 100644 --- a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 +++ b/bin/tests/system/enginepkcs11/ns2/named.conf.j2 @@ -8,13 +8,13 @@ options { }; key "keyforview1" { - algorithm @DEFAULT_HMAC@; - secret "YPfMoAk6h+3iN8MDRQC004iSNHY="; + algorithm @DEFAULT_HMAC@; + secret "YPfMoAk6h+3iN8MDRQC004iSNHY="; }; key "keyforview2" { - algorithm @DEFAULT_HMAC@; - secret "4xILSZQnuO1UKubXHkYUsvBRPu8="; + algorithm @DEFAULT_HMAC@; + secret "4xILSZQnuO1UKubXHkYUsvBRPu8="; }; key-store "hsm" { diff --git a/bin/tests/system/filters/ns1/named.conf.j2 b/bin/tests/system/filters/ns1/named.conf.j2 index 0a44c4682c3..2ee50b11cc3 100644 --- a/bin/tests/system/filters/ns1/named.conf.j2 +++ b/bin/tests/system/filters/ns1/named.conf.j2 @@ -9,17 +9,17 @@ options { }; {% if family == "v6" %} - plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { - filter-@filtertype@-on-v6 yes; - filter-@filtertype@ { @ns.ip6@; }; - }; +plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { + filter-@filtertype@-on-v6 yes; + filter-@filtertype@ { @ns.ip6@; }; +}; {% else %} - acl filterees { @ns.ip@; }; +acl filterees { @ns.ip@; }; - plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { - filter-@filtertype@-on-v4 yes; - filter-@filtertype@ { filterees; }; - }; +plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { + filter-@filtertype@-on-v4 yes; + filter-@filtertype@ { filterees; }; +}; {% endif %} {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/filters/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 index d67a6f4e3a5..be7b9e26532 100644 --- a/bin/tests/system/filters/ns2/named.conf.j2 +++ b/bin/tests/system/filters/ns2/named.conf.j2 @@ -8,15 +8,15 @@ options { }; {% if family == "v6" %} - plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { - filter-@filtertype@-on-v6 yes; - filter-@filtertype@ { @ns.ip6@; }; - }; +plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { + filter-@filtertype@-on-v6 yes; + filter-@filtertype@ { @ns.ip6@; }; +}; {% else %} - plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { - filter-@filtertype@-on-v4 yes; - filter-@filtertype@ { @ns.ip@; }; - }; +plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { + filter-@filtertype@-on-v4 yes; + filter-@filtertype@ { @ns.ip@; }; +}; {% endif %} {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/filters/ns3/named.conf.j2 b/bin/tests/system/filters/ns3/named.conf.j2 index 4a619f72b5e..ac6d84b21c2 100644 --- a/bin/tests/system/filters/ns3/named.conf.j2 +++ b/bin/tests/system/filters/ns3/named.conf.j2 @@ -8,15 +8,15 @@ options { }; {% if family == "v6" %} - plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { - filter-@filtertype@-on-v6 break-dnssec; - filter-@filtertype@ { @ns.ip6@; }; - }; +plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { + filter-@filtertype@-on-v6 break-dnssec; + filter-@filtertype@ { @ns.ip6@; }; +}; {% else %} - plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { - filter-@filtertype@-on-v4 break-dnssec; - filter-@filtertype@ { @ns.ip@; }; - }; +plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { + filter-@filtertype@-on-v4 break-dnssec; + filter-@filtertype@ { @ns.ip@; }; +}; {% endif %} {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/forward/ns2/named-tls.conf.j2 b/bin/tests/system/forward/ns2/named-tls.conf.j2 index b8f10118866..d482ebe6a2f 100644 --- a/bin/tests/system/forward/ns2/named-tls.conf.j2 +++ b/bin/tests/system/forward/ns2/named-tls.conf.j2 @@ -1,27 +1,27 @@ tls tls-forward-secrecy { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv02.crt01.example.nil.key"; - cert-file "../CA/certs/srv02.crt01.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv02.crt01.example.nil.key"; + cert-file "../CA/certs/srv02.crt01.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; }; tls tls-forward-secrecy-mutual-tls { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv02.crt01.example.nil.key"; - cert-file "../CA/certs/srv02.crt01.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv02.crt01.example.nil.key"; + cert-file "../CA/certs/srv02.crt01.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-expired { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv02.crt02-expired.example.nil.key"; - cert-file "../CA/certs/srv02.crt02-expired.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv02.crt02-expired.example.nil.key"; + cert-file "../CA/certs/srv02.crt02-expired.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; }; diff --git a/bin/tests/system/forward/ns4/named-tls.conf.j2 b/bin/tests/system/forward/ns4/named-tls.conf.j2 index 9f49d99fd6c..fbc5a73d623 100644 --- a/bin/tests/system/forward/ns4/named-tls.conf.j2 +++ b/bin/tests/system/forward/ns4/named-tls.conf.j2 @@ -1,37 +1,37 @@ tls tls-forward-secrecy { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-forward-secrecy-remote-hostname { - protocols { TLSv1.2; }; - ca-file "../CA/CA.pem"; - remote-hostname "srv02.crt01.example.nil"; + protocols { TLSv1.2; }; + ca-file "../CA/CA.pem"; + remote-hostname "srv02.crt01.example.nil"; }; tls tls-forward-secrecy-bad-remote-hostname { - protocols { TLSv1.2; }; - ca-file "../CA/CA.pem"; - remote-hostname "srv02-bad.crt01.example.nil"; + protocols { TLSv1.2; }; + ca-file "../CA/CA.pem"; + remote-hostname "srv02-bad.crt01.example.nil"; }; tls tls-forward-secrecy-mutual-tls { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - key-file "../CA/certs/srv04.crt01.example.nil.key"; - cert-file "../CA/certs/srv04.crt01.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + key-file "../CA/certs/srv04.crt01.example.nil.key"; + cert-file "../CA/certs/srv04.crt01.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-expired { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; zone "example1." { diff --git a/bin/tests/system/include_multiplecfg/ns2/mars.conf b/bin/tests/system/include_multiplecfg/ns2/mars.conf index bf5fd3bdb58..b7c4455a6e6 100644 --- a/bin/tests/system/include_multiplecfg/ns2/mars.conf +++ b/bin/tests/system/include_multiplecfg/ns2/mars.conf @@ -1,5 +1,5 @@ zone "mars.com" { - type primary; - file "mars.com.db"; + type primary; + file "mars.com.db"; }; diff --git a/bin/tests/system/include_multiplecfg/ns2/zone1.conf b/bin/tests/system/include_multiplecfg/ns2/zone1.conf index 210737292f6..d84f895df80 100644 --- a/bin/tests/system/include_multiplecfg/ns2/zone1.conf +++ b/bin/tests/system/include_multiplecfg/ns2/zone1.conf @@ -1,5 +1,5 @@ zone "zone1.com" { - type primary; - file "zone1.com.db"; + type primary; + file "zone1.com.db"; }; diff --git a/bin/tests/system/include_multiplecfg/ns2/zone2.conf b/bin/tests/system/include_multiplecfg/ns2/zone2.conf index be049eac3da..2e2cf763d1c 100644 --- a/bin/tests/system/include_multiplecfg/ns2/zone2.conf +++ b/bin/tests/system/include_multiplecfg/ns2/zone2.conf @@ -1,5 +1,5 @@ zone "zone2.com" { - type primary; - file "zone2.com.db"; + type primary; + file "zone2.com.db"; }; diff --git a/bin/tests/system/inline/ns3/named.conf.j2 b/bin/tests/system/inline/ns3/named.conf.j2 index 6bf6066e471..8ffc7dd6ea4 100644 --- a/bin/tests/system/inline/ns3/named.conf.j2 +++ b/bin/tests/system/inline/ns3/named.conf.j2 @@ -47,12 +47,12 @@ zone "bits" { }; zone "incremental-updates" { - type primary; - file "incremental-updates.db"; - inline-signing yes; - dnssec-policy inline; - sig-signing-signatures 1; // force incremental processing - allow-update { any; }; + type primary; + file "incremental-updates.db"; + inline-signing yes; + dnssec-policy inline; + sig-signing-signatures 1; // force incremental processing + allow-update { any; }; }; server 10.53.0.4 { request-ixfr no; }; diff --git a/bin/tests/system/kasp/ns1/named.conf.j2 b/bin/tests/system/kasp/ns1/named.conf.j2 index fe8c500e614..6e003c2c9d8 100644 --- a/bin/tests/system/kasp/ns1/named.conf.j2 +++ b/bin/tests/system/kasp/ns1/named.conf.j2 @@ -3,7 +3,7 @@ options { {% include_indented "_common/options.conf.j2" %} recursion no; - allow-transfer { any; }; + allow-transfer { any; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/kasp/ns3/ed25519.conf b/bin/tests/system/kasp/ns3/ed25519.conf index 89380e14cd9..21f12120cff 100644 --- a/bin/tests/system/kasp/ns3/ed25519.conf +++ b/bin/tests/system/kasp/ns3/ed25519.conf @@ -1,15 +1,15 @@ dnssec-policy "ed25519" { - dnskey-ttl 1234; + dnskey-ttl 1234; - keys { - ksk key-directory lifetime P10Y algorithm 15; - zsk key-directory lifetime P5Y algorithm 15; - zsk key-directory lifetime P1Y algorithm 15 256; - }; + keys { + ksk key-directory lifetime P10Y algorithm 15; + zsk key-directory lifetime P5Y algorithm 15; + zsk key-directory lifetime P1Y algorithm 15 256; + }; }; zone "ed25519.kasp" { - type primary; - file "ed25519.kasp.db"; - dnssec-policy "ed25519"; + type primary; + file "ed25519.kasp.db"; + dnssec-policy "ed25519"; }; diff --git a/bin/tests/system/kasp/ns3/ed448.conf b/bin/tests/system/kasp/ns3/ed448.conf index 379f02c93ae..62b7700284b 100644 --- a/bin/tests/system/kasp/ns3/ed448.conf +++ b/bin/tests/system/kasp/ns3/ed448.conf @@ -1,15 +1,15 @@ dnssec-policy "ed448" { - dnskey-ttl 1234; + dnskey-ttl 1234; - keys { - ksk key-directory lifetime P10Y algorithm 16; - zsk key-directory lifetime P5Y algorithm 16; - zsk key-directory lifetime P1Y algorithm 16 456; - }; + keys { + ksk key-directory lifetime P10Y algorithm 16; + zsk key-directory lifetime P5Y algorithm 16; + zsk key-directory lifetime P1Y algorithm 16 456; + }; }; zone "ed448.kasp" { - type primary; - file "ed448.kasp.db"; - dnssec-policy "ed448"; + type primary; + file "ed448.kasp.db"; + dnssec-policy "ed448"; }; diff --git a/bin/tests/system/kasp/ns3/named-fips.conf.j2 b/bin/tests/system/kasp/ns3/named-fips.conf.j2 index 68627553aae..a6b59fb04dc 100644 --- a/bin/tests/system/kasp/ns3/named-fips.conf.j2 +++ b/bin/tests/system/kasp/ns3/named-fips.conf.j2 @@ -16,10 +16,10 @@ zone "UPPER.KASP" { /* A zone with special characters. */ zone {% raw %}"i-am.\":\;?&[]\@!\$*+,|=\.\(\)special.kasp."{% endraw %} { - type primary; - file "i-am.special.kasp.db"; - check-names ignore; - dnssec-policy "default"; + type primary; + file "i-am.special.kasp.db"; + check-names ignore; + dnssec-policy "default"; }; /* checkds: Zone with one KSK. */ diff --git a/bin/tests/system/ksr/ns1/named.conf.j2 b/bin/tests/system/ksr/ns1/named.conf.j2 index 1e9d3eb1cbf..f0b586c515f 100644 --- a/bin/tests/system/ksr/ns1/named.conf.j2 +++ b/bin/tests/system/ksr/ns1/named.conf.j2 @@ -74,17 +74,17 @@ dnssec-policy "fast" { ksk lifetime unlimited algorithm @DEFAULT_ALGORITHM@; zsk lifetime 8792 algorithm @DEFAULT_ALGORITHM@; }; - dnskey-ttl 439; - max-zone-ttl 4396; - zone-propagation-delay 439; - signatures-validity 6; - signatures-validity-dnskey 6; - signatures-refresh 2; - signatures-jitter 0; - publish-safety 1; - retire-safety 1; - parent-ds-ttl 5; - parent-propagation-delay 5; + dnskey-ttl 439; + max-zone-ttl 4396; + zone-propagation-delay 439; + signatures-validity 6; + signatures-validity-dnskey 6; + signatures-refresh 2; + signatures-jitter 0; + publish-safety 1; + retire-safety 1; + parent-ds-ttl 5; + parent-propagation-delay 5; }; dnssec-policy "invalid-skr" { diff --git a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 index dd2a95f700d..4360f834c13 100644 --- a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 @@ -6,18 +6,18 @@ options { logging { channel default_log { - buffered no; - file "@TMPDIR@/example.log" versions 1 size 1k suffix increment; # small size - severity debug 100; - print-time yes; + buffered no; + file "@TMPDIR@/example.log" versions 1 size 1k suffix increment; # small size + severity debug 100; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; channel query_log { - file "query_log"; - print-time yes; - buffered yes; + file "query_log"; + print-time yes; + buffered yes; }; category queries { query_log; }; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 index f927b80fd16..ad1855b6f54 100644 --- a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 @@ -6,8 +6,8 @@ options { logging { channel default_log { - file "/tmp"; - print-time yes; + file "/tmp"; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 index e9f8122deb7..87b932aa4dd 100644 --- a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 @@ -6,18 +6,18 @@ options { logging { channel default_log { - buffered no; - file "named_inc" versions 1 size 1k suffix increment; # small size - severity debug 100; - print-time yes; + buffered no; + file "named_inc" versions 1 size 1k suffix increment; # small size + severity debug 100; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; channel query_log { - file "query_log"; - print-time yes; - buffered yes; + file "query_log"; + print-time yes; + buffered yes; }; category queries { query_log; }; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 index ac1c0359041..9a7e75ae10e 100644 --- a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 @@ -6,8 +6,8 @@ options { logging { channel default_log { - file "named_pipe"; - print-time yes; + file "named_pipe"; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 index 3d88f40810d..dc52a903df8 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 @@ -6,16 +6,16 @@ options { logging { channel default_log { - file "named_log"; - print-time yes; + file "named_log"; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; channel query_log { - file "query_log"; - print-time yes; - buffered yes; + file "query_log"; + print-time yes; + buffered yes; }; category queries { query_log; }; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 index fbbc66180dc..3c3dff4ecd9 100644 --- a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 @@ -6,8 +6,8 @@ options { logging { channel default_log { - file "named_sym"; - print-time yes; + file "named_sym"; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 index db37240c6aa..8f03293a3c8 100644 --- a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 @@ -6,18 +6,18 @@ options { logging { channel default_log { - buffered no; - file "named_ts" versions 3 size 1000 suffix timestamp; # small size - severity debug 100; - print-time yes; + buffered no; + file "named_ts" versions 3 size 1000 suffix timestamp; # small size + severity debug 100; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; channel query_log { - file "query_log"; - print-time yes; - buffered yes; + file "query_log"; + print-time yes; + buffered yes; }; category queries { query_log; }; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 index 83139ad351f..bd1999b22aa 100644 --- a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 @@ -6,18 +6,18 @@ options { logging { channel default_log { - buffered no; - file "named_unlimited" versions unlimited size 1000; - severity debug 100; - print-time yes; + buffered no; + file "named_unlimited" versions unlimited size 1000; + severity debug 100; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; channel query_log { - file "query_log"; - print-time yes; - buffered no; + file "query_log"; + print-time yes; + buffered no; }; category queries { query_log; }; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 index 2accce0b4e6..ad3ad0bfbae 100644 --- a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 @@ -6,18 +6,18 @@ options { logging { channel default_log { - buffered no; - file "named_vers" versions 5 size 1000; // really small size - severity debug 100; - print-time yes; + buffered no; + file "named_vers" versions 5 size 1000; // really small size + severity debug 100; + print-time yes; }; category default { default_log; default_debug; }; category lame-servers { null; }; channel query_log { - file "query_log"; - print-time yes; - buffered yes; + file "query_log"; + print-time yes; + buffered yes; }; category queries { query_log; }; }; diff --git a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 b/bin/tests/system/migrate2kasp/ns4/named.conf.j2 index b2836b28be6..4ea06129e88 100644 --- a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 +++ b/bin/tests/system/migrate2kasp/ns4/named.conf.j2 @@ -42,7 +42,7 @@ key "internal" { }; view "ext" { - match-clients { key "external"; }; + match-clients { key "external"; }; zone "view-rsasha256.kasp" { type primary; @@ -54,7 +54,7 @@ view "ext" { }; view "int" { - match-clients { key "internal"; }; + match-clients { key "internal"; }; zone "view-rsasha256.kasp" { type primary; diff --git a/bin/tests/system/notify/ns2/named-tls.conf.j2 b/bin/tests/system/notify/ns2/named-tls.conf.j2 index 12e05a4951c..446d1be6476 100644 --- a/bin/tests/system/notify/ns2/named-tls.conf.j2 +++ b/bin/tests/system/notify/ns2/named-tls.conf.j2 @@ -1,27 +1,27 @@ tls tls-forward-secrecy { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv02.crt01.example.com.key"; - cert-file "../CA/certs/srv02.crt01.example.com.pem"; - dhparam-file "../dhparam3072.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv02.crt01.example.com.key"; + cert-file "../CA/certs/srv02.crt01.example.com.pem"; + dhparam-file "../dhparam3072.pem"; }; tls tls-forward-secrecy-mutual-tls { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv02.crt01.example.com.key"; - cert-file "../CA/certs/srv02.crt01.example.com.pem"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv02.crt01.example.com.key"; + cert-file "../CA/certs/srv02.crt01.example.com.pem"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-expired { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv02.crt01-expired.example.com.key"; - cert-file "../CA/certs/srv02.crt01-expired.example.com.pem"; - dhparam-file "../dhparam3072.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv02.crt01-expired.example.com.key"; + cert-file "../CA/certs/srv02.crt01-expired.example.com.pem"; + dhparam-file "../dhparam3072.pem"; }; diff --git a/bin/tests/system/notify/ns3/named-tls.conf.j2 b/bin/tests/system/notify/ns3/named-tls.conf.j2 index 9d620c51cff..79d33e1ce8b 100644 --- a/bin/tests/system/notify/ns3/named-tls.conf.j2 +++ b/bin/tests/system/notify/ns3/named-tls.conf.j2 @@ -1,37 +1,37 @@ tls tls-forward-secrecy { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-forward-secrecy-remote-hostname { - protocols { TLSv1.2; }; - ca-file "../CA/CA.pem"; - remote-hostname "srv02.crt01.example.com"; + protocols { TLSv1.2; }; + ca-file "../CA/CA.pem"; + remote-hostname "srv02.crt01.example.com"; }; tls tls-forward-secrecy-bad-remote-hostname { - protocols { TLSv1.2; }; - ca-file "../CA/CA.pem"; - remote-hostname "srv02-bad.crt01.example.com"; + protocols { TLSv1.2; }; + ca-file "../CA/CA.pem"; + remote-hostname "srv02-bad.crt01.example.com"; }; tls tls-forward-secrecy-mutual-tls { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - key-file "../CA/certs/srv03.crt01.example.com.key"; - cert-file "../CA/certs/srv03.crt01.example.com.pem"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + key-file "../CA/certs/srv03.crt01.example.com.key"; + cert-file "../CA/certs/srv03.crt01.example.com.pem"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-expired { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; zone tls-x1 { diff --git a/bin/tests/system/nsec3/ns3/named-fips.conf.j2 b/bin/tests/system/nsec3/ns3/named-fips.conf.j2 index 32f8bb212d1..74b982bc84a 100644 --- a/bin/tests/system/nsec3/ns3/named-fips.conf.j2 +++ b/bin/tests/system/nsec3/ns3/named-fips.conf.j2 @@ -169,10 +169,10 @@ zone "nsec3-dynamic-update-inline.kasp" { * This zone will have an empty nonterminal node added and a node deleted. */ zone "nsec3-xfr-inline.kasp" { - type secondary; - file "nsec3-xfr-inline.kasp.db"; - dnssec-policy "nsec"; - primaries { 10.53.0.2; }; + type secondary; + file "nsec3-xfr-inline.kasp.db"; + dnssec-policy "nsec"; + primaries { 10.53.0.2; }; }; {% endif %}{# nsec3-xfr-inline.kasp #} diff --git a/bin/tests/system/nsec3/ns5/named.conf.j2 b/bin/tests/system/nsec3/ns5/named.conf.j2 index a41db29701e..164bfe1ccce 100644 --- a/bin/tests/system/nsec3/ns5/named.conf.j2 +++ b/bin/tests/system/nsec3/ns5/named.conf.j2 @@ -10,11 +10,11 @@ options { {% include "_common/controls.conf.j2" %} trust-anchors { - evil.test. static-key 257 3 13 "yh1W7zgrqOsAZdKAh597SI7F2ye4ReiLmBNsDg+TDLJQ+3C2fXfrsQyY MvA+hmzTQdKX24zlVlD3YAVA6+VmrQ=="; + evil.test. static-key 257 3 13 "yh1W7zgrqOsAZdKAh597SI7F2ye4ReiLmBNsDg+TDLJQ+3C2fXfrsQyY MvA+hmzTQdKX24zlVlD3YAVA6+VmrQ=="; }; zone "evil.test" { - type forward; - forward only; - forwarders { 10.53.0.7 port @PORT@; }; + type forward; + forward only; + forwarders { 10.53.0.7 port @PORT@; }; }; diff --git a/bin/tests/system/nsec3/ns6/named.conf.j2 b/bin/tests/system/nsec3/ns6/named.conf.j2 index 909fdd457c1..281b0e13396 100644 --- a/bin/tests/system/nsec3/ns6/named.conf.j2 +++ b/bin/tests/system/nsec3/ns6/named.conf.j2 @@ -10,6 +10,6 @@ options { {% include "_common/controls.conf.j2" %} zone "evil.test" { - type primary; - file "evil.test.db.signed"; + type primary; + file "evil.test.db.signed"; }; diff --git a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 index 2aecea1cd36..553b98795c9 100644 --- a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 @@ -18,7 +18,7 @@ options { dnstap { resolver query; }; dnstap-output file "dnstap.out"; {% if maxdelegationservers %} - @maxdelegationservers@ + @maxdelegationservers@ {% endif %} }; diff --git a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 index 12ca03f3bed..770e7ba659c 100644 --- a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 @@ -6,7 +6,7 @@ options { dnstap { resolver query; }; dnstap-output file "dnstap.out"; {% if maxdelegationservers %} - @maxdelegationservers@ + @maxdelegationservers@ {% endif %} }; diff --git a/bin/tests/system/nsupdate/ns1/named.conf.j2 b/bin/tests/system/nsupdate/ns1/named.conf.j2 index d9c5e9e548a..362aa333fab 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns1/named.conf.j2 @@ -130,18 +130,18 @@ zone "keytests.nil" { type primary; file "keytests.db"; update-policy { - grant md5-key name md5.keytests.nil. ANY; - grant sha1-key name sha1.keytests.nil. ANY; - grant sha224-key name sha224.keytests.nil. ANY; - grant sha256-key name sha256.keytests.nil. ANY; - grant sha384-key name sha384.keytests.nil. ANY; - grant sha512-key name sha512.keytests.nil. ANY; - grant legacy-157 name 157.keytests.nil. ANY; - grant legacy-161 name 161.keytests.nil. ANY; - grant legacy-162 name 162.keytests.nil. ANY; - grant legacy-163 name 163.keytests.nil. ANY; - grant legacy-164 name 164.keytests.nil. ANY; - grant legacy-165 name 165.keytests.nil. ANY; + grant md5-key name md5.keytests.nil. ANY; + grant sha1-key name sha1.keytests.nil. ANY; + grant sha224-key name sha224.keytests.nil. ANY; + grant sha256-key name sha256.keytests.nil. ANY; + grant sha384-key name sha384.keytests.nil. ANY; + grant sha512-key name sha512.keytests.nil. ANY; + grant legacy-157 name 157.keytests.nil. ANY; + grant legacy-161 name 161.keytests.nil. ANY; + grant legacy-162 name 162.keytests.nil. ANY; + grant legacy-163 name 163.keytests.nil. ANY; + grant legacy-164 name 164.keytests.nil. ANY; + grant legacy-165 name 165.keytests.nil. ANY; }; }; diff --git a/bin/tests/system/nsupdate/ns1/tls.conf.j2 b/bin/tests/system/nsupdate/ns1/tls.conf.j2 index 6478a9c6f5a..21a6e0a36e8 100644 --- a/bin/tests/system/nsupdate/ns1/tls.conf.j2 +++ b/bin/tests/system/nsupdate/ns1/tls.conf.j2 @@ -1,27 +1,27 @@ tls tls-forward-secrecy { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv01.crt01.example.nil.key"; - cert-file "../CA/certs/srv01.crt01.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv01.crt01.example.nil.key"; + cert-file "../CA/certs/srv01.crt01.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; }; tls tls-forward-secrecy-mutual-tls { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv01.crt01.example.nil.key"; - cert-file "../CA/certs/srv01.crt01.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; - ca-file "../CA/CA.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv01.crt01.example.nil.key"; + cert-file "../CA/certs/srv01.crt01.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; + ca-file "../CA/CA.pem"; }; tls tls-expired { - protocols { TLSv1.2; }; - ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; - prefer-server-ciphers yes; - key-file "../CA/certs/srv01.crt02-expired.example.nil.key"; - cert-file "../CA/certs/srv01.crt02-expired.example.nil.pem"; - dhparam-file "../dhparam3072.pem"; + protocols { TLSv1.2; }; + ciphers "HIGH:!kRSA:!aNULL:!eNULL:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!SHA1:!SHA256:!SHA384"; + prefer-server-ciphers yes; + key-file "../CA/certs/srv01.crt02-expired.example.nil.key"; + cert-file "../CA/certs/srv01.crt02-expired.example.nil.pem"; + dhparam-file "../dhparam3072.pem"; }; diff --git a/bin/tests/system/nta/ns2/named.conf.j2 b/bin/tests/system/nta/ns2/named.conf.j2 index fc663a2c6bd..947eeee0bc4 100644 --- a/bin/tests/system/nta/ns2/named.conf.j2 +++ b/bin/tests/system/nta/ns2/named.conf.j2 @@ -4,7 +4,7 @@ options { {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; - notify-delay 1; + notify-delay 1; dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/optout/ns2/named.conf.j2 b/bin/tests/system/optout/ns2/named.conf.j2 index 62563116add..d1a8da4d4c2 100644 --- a/bin/tests/system/optout/ns2/named.conf.j2 +++ b/bin/tests/system/optout/ns2/named.conf.j2 @@ -4,9 +4,9 @@ options { {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; - recursion no; - dnssec-validation no; - ixfr-from-differences yes; + recursion no; + dnssec-validation no; + ixfr-from-differences yes; sig-signing-nodes 900; sig-signing-signatures 900; }; diff --git a/bin/tests/system/redirect/ns5/named.conf.j2 b/bin/tests/system/redirect/ns5/named.conf.j2 index a4bb12c45d4..0cae4813fbe 100644 --- a/bin/tests/system/redirect/ns5/named.conf.j2 +++ b/bin/tests/system/redirect/ns5/named.conf.j2 @@ -9,12 +9,12 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db.signed"; + type primary; + file "root.db.signed"; }; // An unsigned zone that ns6 has a delegation for. zone "unsigned." { - type primary; - file "unsigned.db"; + type primary; + file "unsigned.db"; }; diff --git a/bin/tests/system/redirect/ns6/named.conf.j2 b/bin/tests/system/redirect/ns6/named.conf.j2 index 94048681700..b508c209e5a 100644 --- a/bin/tests/system/redirect/ns6/named.conf.j2 +++ b/bin/tests/system/redirect/ns6/named.conf.j2 @@ -9,12 +9,12 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; // A signed zone that ns5 has a delegation for. zone "signed." { - type primary; - file "signed.db.signed"; + type primary; + file "signed.db.signed"; }; diff --git a/bin/tests/system/redirect/ns7/named.conf.j2 b/bin/tests/system/redirect/ns7/named.conf.j2 index 7feed000e05..b320c35988a 100644 --- a/bin/tests/system/redirect/ns7/named.conf.j2 +++ b/bin/tests/system/redirect/ns7/named.conf.j2 @@ -14,11 +14,11 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; zone "redirect" { - type primary; - file "redirect.db"; + type primary; + file "redirect.db"; }; diff --git a/bin/tests/system/redirect/ns8/named.conf.j2 b/bin/tests/system/redirect/ns8/named.conf.j2 index cf0513c0bbf..5b5edad914d 100644 --- a/bin/tests/system/redirect/ns8/named.conf.j2 +++ b/bin/tests/system/redirect/ns8/named.conf.j2 @@ -14,6 +14,6 @@ options { {% include "_common/controls.conf.j2" %} zone "." { - type hint; - file "root.hints"; + type hint; + file "root.hints"; }; diff --git a/bin/tests/system/resolver/ns1/named.conf.j2 b/bin/tests/system/resolver/ns1/named.conf.j2 index 4d154401c3a..10eeba9992d 100644 --- a/bin/tests/system/resolver/ns1/named.conf.j2 +++ b/bin/tests/system/resolver/ns1/named.conf.j2 @@ -2,10 +2,12 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } - except-from { "example.org"; }; + except-from { "example.org"; }; deny-answer-aliases { "example.org"; } - except-from { "goodcname.example.net"; - "gooddname.example.net"; }; + except-from { + "goodcname.example.net"; + "gooddname.example.net"; + }; allow-query {!10.53.0.8; any; }; max-zone-ttl unlimited; resolver-query-timeout 5000; # 5 seconds @@ -21,15 +23,15 @@ server 10.53.0.3 { }; server 10.42.23.3/32 { - notify-source 10.42.22.1; - query-source address 10.42.22.1; - transfer-source 10.42.22.1; + notify-source 10.42.22.1; + query-source address 10.42.22.1; + transfer-source 10.42.22.1; }; server fd92:7065:b8e:ffff::1000 { - notify-source-v6 fd92:7065:b8e:ffff::1001; - query-source-v6 address fd92:7065:b8e:ffff::1001; - transfer-source-v6 fd92:7065:b8e:ffff::1001; + notify-source-v6 fd92:7065:b8e:ffff::1001; + query-source-v6 address fd92:7065:b8e:ffff::1001; + transfer-source-v6 fd92:7065:b8e:ffff::1001; }; view "default" { diff --git a/bin/tests/system/resolver/ns1/named2.conf.j2 b/bin/tests/system/resolver/ns1/named2.conf.j2 index b2d5b677b52..be015b3782d 100644 --- a/bin/tests/system/resolver/ns1/named2.conf.j2 +++ b/bin/tests/system/resolver/ns1/named2.conf.j2 @@ -4,10 +4,10 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; attach-cache "globalcache"; - max-zone-ttl unlimited; - resolver-query-timeout 5000; # 5 seconds - max-recursion-queries 100; - request-zoneversion yes; + max-zone-ttl unlimited; + resolver-query-timeout 5000; # 5 seconds + max-recursion-queries 100; + request-zoneversion yes; }; view "default" { diff --git a/bin/tests/system/resolver/ns4/named.conf.j2 b/bin/tests/system/resolver/ns4/named.conf.j2 index 1ccf4b20d9a..e9d90f18750 100644 --- a/bin/tests/system/resolver/ns4/named.conf.j2 +++ b/bin/tests/system/resolver/ns4/named.conf.j2 @@ -33,8 +33,8 @@ zone "broken" { }; zone "sourcens" { - type primary; - file "sourcens.db"; + type primary; + file "sourcens.db"; }; zone "v4only.net" { diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2 index 90c690a49d9..35835c97ba1 100644 --- a/bin/tests/system/rollover/ns3/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns3/named.common.conf.j2 @@ -7,10 +7,10 @@ include "trusted.conf"; options { - {% include_indented "_common/options.conf.j2" %} - allow-transfer { any; }; - dnssec-validation @dnssec_validation@; - notify-cfg CDS { notify yes; }; + {% include_indented "_common/options.conf.j2" %} + allow-transfer { any; }; + dnssec-validation @dnssec_validation@; + notify-cfg CDS { notify yes; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rollover/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named.conf.j2 index 09f895f2e04..ef7b30883cb 100644 --- a/bin/tests/system/rollover/ns3/named.conf.j2 +++ b/bin/tests/system/rollover/ns3/named.conf.j2 @@ -3,10 +3,10 @@ include "named.common.conf"; {% for zone in ['manual-rollover.kasp', 'manual-rollover-zrrsig-rumoured.kasp'] %} zone "@zone@" { - type primary; - file "@zone@.db"; - dnssec-policy "manual-rollover"; - notify no; + type primary; + file "@zone@.db"; + dnssec-policy "manual-rollover"; + notify no; }; {% endfor %} diff --git a/bin/tests/system/rollover/ns4/named.common.conf.j2 b/bin/tests/system/rollover/ns4/named.common.conf.j2 index e744591d323..173f6454bc2 100644 --- a/bin/tests/system/rollover/ns4/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns4/named.common.conf.j2 @@ -12,15 +12,15 @@ */ options { - {% include_indented "_common/options.conf.j2" %} - allow-transfer { any; }; - recursion no; - dnssec-validation no; + {% include_indented "_common/options.conf.j2" %} + allow-transfer { any; }; + recursion no; + dnssec-validation no; }; {% include "_common/controls.conf.j2" %} zone "." { - type hint; - file "../../_common/root.hint.blackhole"; + type hint; + file "../../_common/root.hint.blackhole"; }; diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 b/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 index 1032e7f3dce..86e1941ec13 100644 --- a/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 +++ b/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 @@ -2,9 +2,9 @@ include "kasp.conf"; include "named.common.conf"; zone "three-is-a-crowd.kasp" { - type primary; - file "three-is-a-crowd.kasp.db"; - inline-signing yes; - /* Use same policy as KSK rollover test zones. */ - dnssec-policy "ksk-doubleksk-autosign"; + type primary; + file "three-is-a-crowd.kasp.db"; + inline-signing yes; + /* Use same policy as KSK rollover test zones. */ + dnssec-policy "ksk-doubleksk-autosign"; }; diff --git a/bin/tests/system/rollover_multisigner/ns3/named.conf.j2 b/bin/tests/system/rollover_multisigner/ns3/named.conf.j2 index ec51a16444f..1ebeeaaaefd 100644 --- a/bin/tests/system/rollover_multisigner/ns3/named.conf.j2 +++ b/bin/tests/system/rollover_multisigner/ns3/named.conf.j2 @@ -3,10 +3,10 @@ include "named.common.conf"; /* RFC 8901 Multi-signer Model 2. */ zone "multisigner-model2.kasp" { - type primary; - file "multisigner-model2.kasp.db"; - dnssec-policy "multisigner-model2"; - allow-update { any; }; + type primary; + file "multisigner-model2.kasp.db"; + dnssec-policy "multisigner-model2"; + allow-update { any; }; }; /* @@ -14,8 +14,8 @@ zone "multisigner-model2.kasp" { * outside of the desired multi-signer key tag range. */ zone "single-to-multisigner.kasp" { - type primary; - file "single-to-multisigner.kasp.db"; - dnssec-policy "multisigner-model2"; - allow-update { any; }; + type primary; + file "single-to-multisigner.kasp.db"; + dnssec-policy "multisigner-model2"; + allow-update { any; }; }; diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2 index 3a21c78793f..a69dab160d6 100644 --- a/bin/tests/system/rpz/ns3/named.conf.j2 +++ b/bin/tests/system/rpz/ns3/named.conf.j2 @@ -16,27 +16,27 @@ options { min-retry-time 1; response-policy { - zone "fast-expire"; - zone "bl" max-policy-ttl 100; - zone "bl-2"; - zone "bl-given" policy given recursive-only yes; - zone "bl-passthru" policy passthru; - zone "bl-no-op" policy no-op; # obsolete for passthru - zone "bl-disabled" policy disabled; - zone "bl-nodata" policy nodata recursive-only no; - zone "bl-nxdomain" policy nxdomain; - zone "bl-cname" policy cname txt-only.tld2.; - zone "bl-wildcname" policy cname *.tld4.; - zone "bl-garden" policy cname a12.tld2.; - zone "bl-drop" policy drop; - zone "bl-tcp-only" policy tcp-only; - zone "bl.tld2"; - zone "manual-update-rpz" ede forged; - zone "mixed-case-rpz"; - zone "include-rpz"; - zone "evil-cname" policy cname a12.tld2. ede blocked; - zone "wild-cname" ede blocked; - zone "slow-rpz"; + zone "fast-expire"; + zone "bl" max-policy-ttl 100; + zone "bl-2"; + zone "bl-given" policy given recursive-only yes; + zone "bl-passthru" policy passthru; + zone "bl-no-op" policy no-op; # obsolete for passthru + zone "bl-disabled" policy disabled; + zone "bl-nodata" policy nodata recursive-only no; + zone "bl-nxdomain" policy nxdomain; + zone "bl-cname" policy cname txt-only.tld2.; + zone "bl-wildcname" policy cname *.tld4.; + zone "bl-garden" policy cname a12.tld2.; + zone "bl-drop" policy drop; + zone "bl-tcp-only" policy tcp-only; + zone "bl.tld2"; + zone "manual-update-rpz" ede forged; + zone "mixed-case-rpz"; + zone "include-rpz"; + zone "evil-cname" policy cname a12.tld2. ede blocked; + zone "wild-cname" ede blocked; + zone "slow-rpz"; } add-soa yes min-ns-dots 0 @@ -110,9 +110,9 @@ zone "include-rpz." { }; zone "slow-rpz." { - type primary; - file "slow-rpz.db"; - notify no; + type primary; + file "slow-rpz.db"; + notify no; }; zone "fast-expire." { diff --git a/bin/tests/system/rpz/ns6/named.conf.j2 b/bin/tests/system/rpz/ns6/named.conf.j2 index 6181f9eea70..6600577670a 100644 --- a/bin/tests/system/rpz/ns6/named.conf.j2 +++ b/bin/tests/system/rpz/ns6/named.conf.j2 @@ -11,8 +11,8 @@ options { qname-minimization disabled; response-policy { - zone "policy1" min-update-interval 0; - zone "bl.tld2s" policy given; + zone "policy1" min-update-interval 0; + zone "bl.tld2s" policy given; } qname-wait-recurse yes // add-soa yes # leave add-soa as default for unset test nsip-enable yes @@ -35,6 +35,6 @@ zone "policy1" { }; zone "bl.tld2s." { - type primary; - file "bl.tld2s.db"; + type primary; + file "bl.tld2s.db"; }; diff --git a/bin/tests/system/rpz/ns7/named.conf.j2 b/bin/tests/system/rpz/ns7/named.conf.j2 index 76fc0ed6445..bc1c9f7298c 100644 --- a/bin/tests/system/rpz/ns7/named.conf.j2 +++ b/bin/tests/system/rpz/ns7/named.conf.j2 @@ -8,7 +8,7 @@ options { dnssec-validation yes; response-policy { - zone "policy2" add-soa no ede none; + zone "policy2" add-soa no ede none; } qname-wait-recurse no nsip-enable yes nsdname-enable yes diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2 index c8338a38e33..ee05c559154 100644 --- a/bin/tests/system/rpz/ns8/named.conf.j2 +++ b/bin/tests/system/rpz/ns8/named.conf.j2 @@ -12,7 +12,7 @@ options { dnssec-validation no; response-policy { - zone "manual-update-rpz"; + zone "manual-update-rpz"; } // add-soa yes // do not set testing default mode min-ns-dots 0 diff --git a/bin/tests/system/rpz/ns9/named.conf.j2 b/bin/tests/system/rpz/ns9/named.conf.j2 index 290c5cd985a..19527d9df97 100644 --- a/bin/tests/system/rpz/ns9/named.conf.j2 +++ b/bin/tests/system/rpz/ns9/named.conf.j2 @@ -13,7 +13,7 @@ options { dns64-server "example.localdomain."; dns64 64:ff9b::/96 { }; response-policy { - zone "rpz"; + zone "rpz"; } qname-wait-recurse no ; diff --git a/bin/tests/system/rpzextra/ns2/named.conf.j2 b/bin/tests/system/rpzextra/ns2/named.conf.j2 index 4865db67025..33b61b9999a 100644 --- a/bin/tests/system/rpzextra/ns2/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns2/named.conf.j2 @@ -9,25 +9,25 @@ options { }; zone "allowed" { - type primary; + type primary; file "allowed.db"; allow-transfer { none; }; }; zone "baddomain" { - type primary; - file "baddomain.db"; - allow-transfer { none; }; + type primary; + file "baddomain.db"; + allow-transfer { none; }; }; zone "gooddomain" { - type primary; - file "gooddomain.db"; - allow-transfer { none; }; + type primary; + file "gooddomain.db"; + allow-transfer { none; }; }; zone "rpz-external.local" { - type primary; - file "rpz-external.local.db"; - allow-transfer { any; }; + type primary; + file "rpz-external.local.db"; + allow-transfer { any; }; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf index 18aec051854..43ff9ae9cfd 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf @@ -2,22 +2,22 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "clientip1"; zone "clientip2"; - } qname-wait-recurse no + } qname-wait-recurse no nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "clientip1" { type primary; file "db.clientip1"; }; - zone "clientip2" { type primary; file "db.clientip2"; }; + # policy zones to be tested + zone "clientip1" { type primary; file "db.clientip1"; }; + zone "clientip2" { type primary; file "db.clientip2"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf index d674c400bee..139525aa2a7 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf @@ -2,22 +2,22 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - servfail-ttl 0; + servfail-ttl 0; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "clientip21"; - } qname-wait-recurse no + } qname-wait-recurse no nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "clientip21" { type primary; file "db.clientip21"; }; + # policy zones to be tested + zone "clientip21" { type primary; file "db.clientip21"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.default.conf b/bin/tests/system/rpzrecurse/ns2/named.default.conf index 8b3b326bd35..b919b5861b7 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.default.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.default.conf @@ -2,10 +2,10 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf b/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf index 6380f9691df..0a8667e6a62 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf @@ -2,16 +2,16 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "invalidprefixlength"; - }; + }; - # policy zones to be tested - zone "invalidprefixlength" { type primary; file "db.invalidprefixlength"; }; + # policy zones to be tested + zone "invalidprefixlength" { type primary; file "db.invalidprefixlength"; }; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.log.conf b/bin/tests/system/rpzrecurse/ns2/named.log.conf index 55ebef6504e..fec3265b671 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.log.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.log.conf @@ -2,24 +2,24 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "log1" log no; zone "log2" log yes; zone "log3"; # missing log clause - } qname-wait-recurse no + } qname-wait-recurse no nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "log1" { type primary; file "db.log1"; }; - zone "log2" { type primary; file "db.log2"; }; - zone "log3" { type primary; file "db.log3"; }; + # policy zones to be tested + zone "log1" { type primary; file "db.log1"; }; + zone "log2" { type primary; file "db.log2"; }; + zone "log3" { type primary; file "db.log3"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.max.conf b/bin/tests/system/rpzrecurse/ns2/named.max.conf index 98c40930c6a..ad14e55e093 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.max.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.max.conf @@ -2,13 +2,13 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "max1"; zone "max2"; zone "max3"; @@ -73,75 +73,75 @@ view "recursive" { zone "max62"; zone "max63"; zone "max64"; - } qname-wait-recurse no + } qname-wait-recurse no nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "max1" { type primary; file "db.max1.local"; }; - zone "max2" { type primary; file "db.max2.local"; }; - zone "max3" { type primary; file "db.max3.local"; }; - zone "max4" { type primary; file "db.max4.local"; }; - zone "max5" { type primary; file "db.max5.local"; }; - zone "max6" { type primary; file "db.max6.local"; }; - zone "max7" { type primary; file "db.max7.local"; }; - zone "max8" { type primary; file "db.max8.local"; }; - zone "max9" { type primary; file "db.max9.local"; }; - zone "max10" { type primary; file "db.max10.local"; }; - zone "max11" { type primary; file "db.max11.local"; }; - zone "max12" { type primary; file "db.max12.local"; }; - zone "max13" { type primary; file "db.max13.local"; }; - zone "max14" { type primary; file "db.max14.local"; }; - zone "max15" { type primary; file "db.max15.local"; }; - zone "max16" { type primary; file "db.max16.local"; }; - zone "max17" { type primary; file "db.max17.local"; }; - zone "max18" { type primary; file "db.max18.local"; }; - zone "max19" { type primary; file "db.max19.local"; }; - zone "max20" { type primary; file "db.max20.local"; }; - zone "max21" { type primary; file "db.max21.local"; }; - zone "max22" { type primary; file "db.max22.local"; }; - zone "max23" { type primary; file "db.max23.local"; }; - zone "max24" { type primary; file "db.max24.local"; }; - zone "max25" { type primary; file "db.max25.local"; }; - zone "max26" { type primary; file "db.max26.local"; }; - zone "max27" { type primary; file "db.max27.local"; }; - zone "max28" { type primary; file "db.max28.local"; }; - zone "max29" { type primary; file "db.max29.local"; }; - zone "max30" { type primary; file "db.max30.local"; }; - zone "max31" { type primary; file "db.max31.local"; }; - zone "max32" { type primary; file "db.max32.local"; }; - zone "max33" { type primary; file "db.max33.local"; }; - zone "max34" { type primary; file "db.max34.local"; }; - zone "max35" { type primary; file "db.max35.local"; }; - zone "max36" { type primary; file "db.max36.local"; }; - zone "max37" { type primary; file "db.max37.local"; }; - zone "max38" { type primary; file "db.max38.local"; }; - zone "max39" { type primary; file "db.max39.local"; }; - zone "max40" { type primary; file "db.max40.local"; }; - zone "max41" { type primary; file "db.max41.local"; }; - zone "max42" { type primary; file "db.max42.local"; }; - zone "max43" { type primary; file "db.max43.local"; }; - zone "max44" { type primary; file "db.max44.local"; }; - zone "max45" { type primary; file "db.max45.local"; }; - zone "max46" { type primary; file "db.max46.local"; }; - zone "max47" { type primary; file "db.max47.local"; }; - zone "max48" { type primary; file "db.max48.local"; }; - zone "max49" { type primary; file "db.max49.local"; }; - zone "max50" { type primary; file "db.max50.local"; }; - zone "max51" { type primary; file "db.max51.local"; }; - zone "max52" { type primary; file "db.max52.local"; }; - zone "max53" { type primary; file "db.max53.local"; }; - zone "max54" { type primary; file "db.max54.local"; }; - zone "max55" { type primary; file "db.max55.local"; }; - zone "max56" { type primary; file "db.max56.local"; }; - zone "max57" { type primary; file "db.max57.local"; }; - zone "max58" { type primary; file "db.max58.local"; }; - zone "max59" { type primary; file "db.max59.local"; }; - zone "max60" { type primary; file "db.max60.local"; }; - zone "max61" { type primary; file "db.max61.local"; }; - zone "max62" { type primary; file "db.max62.local"; }; - zone "max63" { type primary; file "db.max63.local"; }; - zone "max64" { type primary; file "db.max64.local"; }; + # policy zones to be tested + zone "max1" { type primary; file "db.max1.local"; }; + zone "max2" { type primary; file "db.max2.local"; }; + zone "max3" { type primary; file "db.max3.local"; }; + zone "max4" { type primary; file "db.max4.local"; }; + zone "max5" { type primary; file "db.max5.local"; }; + zone "max6" { type primary; file "db.max6.local"; }; + zone "max7" { type primary; file "db.max7.local"; }; + zone "max8" { type primary; file "db.max8.local"; }; + zone "max9" { type primary; file "db.max9.local"; }; + zone "max10" { type primary; file "db.max10.local"; }; + zone "max11" { type primary; file "db.max11.local"; }; + zone "max12" { type primary; file "db.max12.local"; }; + zone "max13" { type primary; file "db.max13.local"; }; + zone "max14" { type primary; file "db.max14.local"; }; + zone "max15" { type primary; file "db.max15.local"; }; + zone "max16" { type primary; file "db.max16.local"; }; + zone "max17" { type primary; file "db.max17.local"; }; + zone "max18" { type primary; file "db.max18.local"; }; + zone "max19" { type primary; file "db.max19.local"; }; + zone "max20" { type primary; file "db.max20.local"; }; + zone "max21" { type primary; file "db.max21.local"; }; + zone "max22" { type primary; file "db.max22.local"; }; + zone "max23" { type primary; file "db.max23.local"; }; + zone "max24" { type primary; file "db.max24.local"; }; + zone "max25" { type primary; file "db.max25.local"; }; + zone "max26" { type primary; file "db.max26.local"; }; + zone "max27" { type primary; file "db.max27.local"; }; + zone "max28" { type primary; file "db.max28.local"; }; + zone "max29" { type primary; file "db.max29.local"; }; + zone "max30" { type primary; file "db.max30.local"; }; + zone "max31" { type primary; file "db.max31.local"; }; + zone "max32" { type primary; file "db.max32.local"; }; + zone "max33" { type primary; file "db.max33.local"; }; + zone "max34" { type primary; file "db.max34.local"; }; + zone "max35" { type primary; file "db.max35.local"; }; + zone "max36" { type primary; file "db.max36.local"; }; + zone "max37" { type primary; file "db.max37.local"; }; + zone "max38" { type primary; file "db.max38.local"; }; + zone "max39" { type primary; file "db.max39.local"; }; + zone "max40" { type primary; file "db.max40.local"; }; + zone "max41" { type primary; file "db.max41.local"; }; + zone "max42" { type primary; file "db.max42.local"; }; + zone "max43" { type primary; file "db.max43.local"; }; + zone "max44" { type primary; file "db.max44.local"; }; + zone "max45" { type primary; file "db.max45.local"; }; + zone "max46" { type primary; file "db.max46.local"; }; + zone "max47" { type primary; file "db.max47.local"; }; + zone "max48" { type primary; file "db.max48.local"; }; + zone "max49" { type primary; file "db.max49.local"; }; + zone "max50" { type primary; file "db.max50.local"; }; + zone "max51" { type primary; file "db.max51.local"; }; + zone "max52" { type primary; file "db.max52.local"; }; + zone "max53" { type primary; file "db.max53.local"; }; + zone "max54" { type primary; file "db.max54.local"; }; + zone "max55" { type primary; file "db.max55.local"; }; + zone "max56" { type primary; file "db.max56.local"; }; + zone "max57" { type primary; file "db.max57.local"; }; + zone "max58" { type primary; file "db.max58.local"; }; + zone "max59" { type primary; file "db.max59.local"; }; + zone "max60" { type primary; file "db.max60.local"; }; + zone "max61" { type primary; file "db.max61.local"; }; + zone "max62" { type primary; file "db.max62.local"; }; + zone "max63" { type primary; file "db.max63.local"; }; + zone "max64" { type primary; file "db.max64.local"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf index da2373b4f26..22ee10446a5 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf @@ -2,20 +2,20 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "wildcard1" policy NXDOMAIN; - } qname-wait-recurse yes + } qname-wait-recurse yes nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "wildcard1" { type primary; file "db.wildcard1"; }; + # policy zones to be tested + zone "wildcard1" { type primary; file "db.wildcard1"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf index 6e799316f94..b06aaa6a90c 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf @@ -2,22 +2,22 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "wildcard2a" policy NXDOMAIN; zone "wildcard2b" policy NXDOMAIN; - } qname-wait-recurse yes + } qname-wait-recurse yes nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "wildcard2a" { type primary; file "db.wildcard2a"; }; - zone "wildcard2b" { type primary; file "db.wildcard2b"; }; + # policy zones to be tested + zone "wildcard2a" { type primary; file "db.wildcard2a"; }; + zone "wildcard2b" { type primary; file "db.wildcard2b"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf index ef2bb39b653..0d9cd7e4e96 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf @@ -2,20 +2,20 @@ include "named.conf.header"; view "recursive" { - zone "." { + zone "." { type hint; file "root.hint"; - }; + }; - # policy configuration to be tested - response-policy { + # policy configuration to be tested + response-policy { zone "wildcard3" policy NXDOMAIN; - } qname-wait-recurse yes + } qname-wait-recurse yes nsdname-enable yes nsip-enable yes; - # policy zones to be tested - zone "wildcard3" { type primary; file "db.wildcard3"; }; + # policy zones to be tested + zone "wildcard3" { type primary; file "db.wildcard3"; }; - recursion yes; + recursion yes; }; diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 index d2319a6e175..eae9cb152da 100644 --- a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 @@ -4,8 +4,8 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; response-policy { zone "policy"; } - nsip-wait-recurse no - nsdname-wait-recurse no + nsip-wait-recurse no + nsdname-wait-recurse no qname-wait-recurse yes nsip-enable yes nsdname-enable yes; diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 index 6b7386ca3c1..34b52f1b5cd 100644 --- a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 @@ -4,8 +4,8 @@ options { {% include_indented "_common/options.conf.j2" %} dnssec-validation no; response-policy { zone "policy"; } - nsip-wait-recurse no - nsdname-wait-recurse no + nsip-wait-recurse no + nsdname-wait-recurse no nsdname-enable yes; }; diff --git a/bin/tests/system/rrl/ns2/named.conf.j2 b/bin/tests/system/rrl/ns2/named.conf.j2 index 07514eb48f6..3bc461fbf5c 100644 --- a/bin/tests/system/rrl/ns2/named.conf.j2 +++ b/bin/tests/system/rrl/ns2/named.conf.j2 @@ -6,13 +6,13 @@ options { dnssec-validation no; rate-limit { - responses-per-second 2; - all-per-second 50; - slip 3; - exempt-clients { 10.53.0.7; }; + responses-per-second 2; + all-per-second 50; + slip 3; + exempt-clients { 10.53.0.7; }; - // small enough to force a table expansion - min-table-size 75; + // small enough to force a table expansion + min-table-size 75; }; }; @@ -23,12 +23,12 @@ options { */ logging { channel debug { - file "log-debug"; - print-category yes; print-severity yes; severity debug 10; + file "log-debug"; + print-category yes; print-severity yes; severity debug 10; }; channel queries { - file "log-queries"; - print-category yes; print-severity yes; severity info; + file "log-queries"; + print-category yes; print-severity yes; severity info; }; category rate-limit { debug; queries; }; category queries { debug; queries; }; diff --git a/bin/tests/system/rrl/ns3/named.conf.j2 b/bin/tests/system/rrl/ns3/named.conf.j2 index d9dfd9a9702..21d4703fbc9 100644 --- a/bin/tests/system/rrl/ns3/named.conf.j2 +++ b/bin/tests/system/rrl/ns3/named.conf.j2 @@ -6,19 +6,19 @@ options { // check that all of the options are parsed without limiting anything rate-limit { - responses-per-second 200; - referrals-per-second 220; - nodata-per-second 230; - nxdomains-per-second 240; - errors-per-second 250; - all-per-second 700; - ipv4-prefix-length 24; - ipv6-prefix-length 64; - qps-scale 10; - window 1; - max-table-size 1000; - log-only no; - min-table-size 0; + responses-per-second 200; + referrals-per-second 220; + nodata-per-second 230; + nxdomains-per-second 240; + errors-per-second 250; + all-per-second 700; + ipv4-prefix-length 24; + ipv6-prefix-length 64; + qps-scale 10; + window 1; + max-table-size 1000; + log-only no; + min-table-size 0; }; }; diff --git a/bin/tests/system/rrl/ns4/named.conf.j2 b/bin/tests/system/rrl/ns4/named.conf.j2 index d079744e8e6..edfb9661868 100644 --- a/bin/tests/system/rrl/ns4/named.conf.j2 +++ b/bin/tests/system/rrl/ns4/named.conf.j2 @@ -7,14 +7,14 @@ options { max-udp-size 4096; rate-limit { - responses-per-second 2; - all-per-second 50; - slip 3; - exempt-clients { 10.53.0.7; }; - log-only yes; + responses-per-second 2; + all-per-second 50; + slip 3; + exempt-clients { 10.53.0.7; }; + log-only yes; - // small enough to force a table expansion - min-table-size 75; + // small enough to force a table expansion + min-table-size 75; }; }; @@ -25,12 +25,12 @@ options { */ logging { channel debug { - file "log-debug"; - print-category yes; print-severity yes; severity debug 10; + file "log-debug"; + print-category yes; print-severity yes; severity debug 10; }; channel queries { - file "log-queries"; - print-category yes; print-severity yes; severity info; + file "log-queries"; + print-category yes; print-severity yes; severity info; }; category rate-limit { debug; queries; }; category queries { debug; queries; }; diff --git a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 index 2aecea1cd36..553b98795c9 100644 --- a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 @@ -18,7 +18,7 @@ options { dnstap { resolver query; }; dnstap-output file "dnstap.out"; {% if maxdelegationservers %} - @maxdelegationservers@ + @maxdelegationservers@ {% endif %} }; diff --git a/bin/tests/system/serve_stale/ns7/named.conf.j2 b/bin/tests/system/serve_stale/ns7/named.conf.j2 index 91963d341e2..a7986cdd852 100644 --- a/bin/tests/system/serve_stale/ns7/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named.conf.j2 @@ -23,13 +23,13 @@ zone "." { // Authoritative zone: nonexist.target.stale -> NXDOMAIN zone "target.stale" { - type primary; - file "target.stale.db"; + type primary; + file "target.stale.db"; }; // Forward source.stale queries to ans2 zone "source.stale" { - type forward; - forward only; - forwarders { 10.53.0.2 port @PORT@; }; + type forward; + forward only; + forwarders { 10.53.0.2 port @PORT@; }; }; diff --git a/bin/tests/system/serve_stale/ns7/named1.conf.j2 b/bin/tests/system/serve_stale/ns7/named1.conf.j2 index 9136510534f..74d88e527c6 100644 --- a/bin/tests/system/serve_stale/ns7/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named1.conf.j2 @@ -23,14 +23,14 @@ zone "." { // Forward source.stale queries to ans2 zone "source.stale" { - type forward; - forward only; - forwarders { 10.53.0.2 port @PORT@; }; + type forward; + forward only; + forwarders { 10.53.0.2 port @PORT@; }; }; // Forward target.stale queries to ans8 zone "target.stale" { - type forward; - forward only; - forwarders { 10.53.0.8 port @PORT@; }; + type forward; + forward only; + forwarders { 10.53.0.8 port @PORT@; }; }; diff --git a/bin/tests/system/sfcache_cname/ns1/named.conf.j2 b/bin/tests/system/sfcache_cname/ns1/named.conf.j2 index a1bf2d087e0..2bb3e5abae9 100644 --- a/bin/tests/system/sfcache_cname/ns1/named.conf.j2 +++ b/bin/tests/system/sfcache_cname/ns1/named.conf.j2 @@ -1,12 +1,12 @@ options { - {% include_indented "_common/options.conf.j2" %} - recursion no; - dnssec-validation no; + {% include_indented "_common/options.conf.j2" %} + recursion no; + dnssec-validation no; }; {% include "_common/controls.conf.j2" %} zone "." { - type primary; - file "root.db"; + type primary; + file "root.db"; }; diff --git a/bin/tests/system/shutdown/ns1/named.conf.j2 b/bin/tests/system/shutdown/ns1/named.conf.j2 index 2fcde778c8d..1a1a99897a3 100644 --- a/bin/tests/system/shutdown/ns1/named.conf.j2 +++ b/bin/tests/system/shutdown/ns1/named.conf.j2 @@ -10,7 +10,7 @@ options { # Delegate .test domain to 10.53.0.2 zone "." { - type primary; - file "root.db"; - allow-transfer { none; }; + type primary; + file "root.db"; + allow-transfer { none; }; }; diff --git a/bin/tests/system/shutdown/resolver/named.conf.j2 b/bin/tests/system/shutdown/resolver/named.conf.j2 index f78c7947192..093e35fa374 100644 --- a/bin/tests/system/shutdown/resolver/named.conf.j2 +++ b/bin/tests/system/shutdown/resolver/named.conf.j2 @@ -8,7 +8,7 @@ logging { }; key rndc_key { - secret "1234abcd8765"; + secret "1234abcd8765"; algorithm @DEFAULT_HMAC@; }; diff --git a/bin/tests/system/staticstub/conf/bad02.conf b/bin/tests/system/staticstub/conf/bad02.conf index 6218dd0bfe2..00e6abd078a 100644 --- a/bin/tests/system/staticstub/conf/bad02.conf +++ b/bin/tests/system/staticstub/conf/bad02.conf @@ -14,6 +14,6 @@ # server-names must be valid domain names. zone "example.com" { - type static-stub; - server-names { "\11.example.net"; }; + type static-stub; + server-names { "\11.example.net"; }; }; diff --git a/bin/tests/system/synthrecord/conf/bad-tsig.conf.j2 b/bin/tests/system/synthrecord/conf/bad-tsig.conf.j2 index 651ba1f38b1..ed05aaecb45 100644 --- a/bin/tests/system/synthrecord/conf/bad-tsig.conf.j2 +++ b/bin/tests/system/synthrecord/conf/bad-tsig.conf.j2 @@ -1,6 +1,6 @@ key "test-tsig." { - algorithm hmac-sha256; - secret "DAopyf1mhCbFVZw7pgmNPBoLUq8wEUT7UuPoLENP2HY="; + algorithm hmac-sha256; + secret "DAopyf1mhCbFVZw7pgmNPBoLUq8wEUT7UuPoLENP2HY="; }; zone example { diff --git a/bin/tests/system/synthrecord/conf/good1.conf.j2 b/bin/tests/system/synthrecord/conf/good1.conf.j2 index 7d1d4249721..de980e7f866 100644 --- a/bin/tests/system/synthrecord/conf/good1.conf.j2 +++ b/bin/tests/system/synthrecord/conf/good1.conf.j2 @@ -1,39 +1,39 @@ zone 10.in-addr.arpa { type primary; file "10.in-addr.arpa.db"; - plugin query "@TOP_BUILDDIR@/synthrecord.@DYLIB@" { - prefix "dynamic-"; - allow-synth { - 10.53.0.0/16; - }; - origin example.; - ttl 60; - }; + plugin query "@TOP_BUILDDIR@/synthrecord.@DYLIB@" { + prefix "dynamic-"; + allow-synth { + 10.53.0.0/16; + }; + origin example.; + ttl 60; + }; }; zone e.f.a.c.ip6.arpa { type primary; file "e.f.a.c.in-addr.arpa.db"; - plugin query "@TOP_BUILDDIR@/synthrecord.@DYLIB@" { - prefix "dynamic-"; - allow-synth { - cafe:cafe::/32; - }; - origin example.; - ttl 60; - }; + plugin query "@TOP_BUILDDIR@/synthrecord.@DYLIB@" { + prefix "dynamic-"; + allow-synth { + cafe:cafe::/32; + }; + origin example.; + ttl 60; + }; }; zone example { type primary; file "example.db"; - plugin query "@TOP_BUILDDIR@/synthrecord.@DYLIB@" { - prefix "dynamic-"; - allow-synth { - 10.53.0.0/16; - cafe:cafe::/32; - }; - origin example.; - ttl 60; - }; + plugin query "@TOP_BUILDDIR@/synthrecord.@DYLIB@" { + prefix "dynamic-"; + allow-synth { + 10.53.0.0/16; + cafe:cafe::/32; + }; + origin example.; + ttl 60; + }; }; diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2 index b8dad4269ec..ad9f7696944 100644 --- a/bin/tests/system/tcp/ns5/named.conf.j2 +++ b/bin/tests/system/tcp/ns5/named.conf.j2 @@ -4,9 +4,9 @@ options { - {% include_indented "_common/options.conf.j2" %} - tcp-listen-queue 32; - tcp-clients 17; + {% include_indented "_common/options.conf.j2" %} + tcp-listen-queue 32; + tcp-clients 17; dnssec-validation no; }; diff --git a/bin/tests/system/tsig/ns1/named-md5.conf.j2 b/bin/tests/system/tsig/ns1/named-md5.conf.j2 index fcaaf8b5eba..5595ddd2b38 100644 --- a/bin/tests/system/tsig/ns1/named-md5.conf.j2 +++ b/bin/tests/system/tsig/ns1/named-md5.conf.j2 @@ -9,6 +9,6 @@ key "md5-trunc" { }; key "hmac-md5-legacy" { - algorithm "hmac-md5"; - secret "B7HCXJs0XnSPzypG5oHuGw=="; + algorithm "hmac-md5"; + secret "B7HCXJs0XnSPzypG5oHuGw=="; }; diff --git a/bin/tests/system/views/ns2/named3.conf.j2 b/bin/tests/system/views/ns2/named3.conf.j2 index 4810be0be8c..0bf7ff5d34f 100644 --- a/bin/tests/system/views/ns2/named3.conf.j2 +++ b/bin/tests/system/views/ns2/named3.conf.j2 @@ -12,9 +12,9 @@ options { {% for name in zone_names %} zone "@name@" { - type primary; - file "@name@.db"; - dnssec-policy default; - inline-signing yes; + type primary; + file "@name@.db"; + dnssec-policy default; + inline-signing yes; }; {% endfor %} diff --git a/bin/tests/system/wildcard/ns1/named.conf.j2 b/bin/tests/system/wildcard/ns1/named.conf.j2 index 9d6dc0e924d..f7519a36f4a 100644 --- a/bin/tests/system/wildcard/ns1/named.conf.j2 +++ b/bin/tests/system/wildcard/ns1/named.conf.j2 @@ -17,9 +17,9 @@ zone "nsec" { type primary; file "nsec.db.signed"; }; zone "private.nsec" { type primary; file "private.nsec.db.signed"; }; zone "nestedwild.test" { - type primary; - file "nestedwild.db"; - check-names ignore; + type primary; + file "nestedwild.db"; + check-names ignore; }; /* diff --git a/bin/tests/system/xfer/ns4/named.conf.j2 b/bin/tests/system/xfer/ns4/named.conf.j2 index e82e0e528f4..b3580c6d547 100644 --- a/bin/tests/system/xfer/ns4/named.conf.j2 +++ b/bin/tests/system/xfer/ns4/named.conf.j2 @@ -26,8 +26,8 @@ zone "." { {% if ns4_as_secondary_for_nil %} zone "nil" { - type secondary; - file "nil.db"; - primaries { 10.53.0.5 key tsig_key; }; + type secondary; + file "nil.db"; + primaries { 10.53.0.5 key tsig_key; }; }; {% endif %}