From: Nicki Křížek Date: Thu, 23 Jul 2026 16:51:10 +0000 (+0000) Subject: Use the shared options template for standard plumbing X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f71e3a65069d112ffb085bf712d7b0fe3d11fd58;p=thirdparty%2Fbind9.git Use the shared options template for standard plumbing Every options block carrying all seven standard plumbing statements gets the _common/options.conf.j2 umbrella include at the top of the block instead. Statement order inside options has no meaning to named, so rendered configs are equivalent. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/acl/ns2/named.conf.j2 b/bin/tests/system/acl/ns2/named.conf.j2 index 2e21dd1f2a9..c67e29d2b79 100644 --- a/bin/tests/system/acl/ns2/named.conf.j2 +++ b/bin/tests/system/acl/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/acl/ns2/named2.conf.j2 b/bin/tests/system/acl/ns2/named2.conf.j2 index 46d272fd2ba..0bda32e0fe1 100644 --- a/bin/tests/system/acl/ns2/named2.conf.j2 +++ b/bin/tests/system/acl/ns2/named2.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2 index c8c1200b674..92d26f7671d 100644 --- a/bin/tests/system/acl/ns2/named3.conf.j2 +++ b/bin/tests/system/acl/ns2/named3.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2 index 10b1807186b..a853cd4e793 100644 --- a/bin/tests/system/acl/ns2/named4.conf.j2 +++ b/bin/tests/system/acl/ns2/named4.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2 index b9c908eea33..baad0db74ec 100644 --- a/bin/tests/system/acl/ns2/named5.conf.j2 +++ b/bin/tests/system/acl/ns2/named5.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/acl/ns3/named.conf.j2 b/bin/tests/system/acl/ns3/named.conf.j2 index 2bcad4b4793..4bdb1c455e6 100644 --- a/bin/tests/system/acl/ns3/named.conf.j2 +++ b/bin/tests/system/acl/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; allow-new-zones yes; diff --git a/bin/tests/system/acl/ns4/named.conf.j2 b/bin/tests/system/acl/ns4/named.conf.j2 index 2768fa40857..368dd059e4b 100644 --- a/bin/tests/system/acl/ns4/named.conf.j2 +++ b/bin/tests/system/acl/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; allow-new-zones yes; diff --git a/bin/tests/system/additional/ns1/named.conf.j2 b/bin/tests/system/additional/ns1/named.conf.j2 index 54ecef1c393..263cf03478e 100644 --- a/bin/tests/system/additional/ns1/named.conf.j2 +++ b/bin/tests/system/additional/ns1/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; notify no; minimal-responses yes; }; diff --git a/bin/tests/system/additional/ns1/named2.conf.j2 b/bin/tests/system/additional/ns1/named2.conf.j2 index aea12f5f5b6..1184bc986f4 100644 --- a/bin/tests/system/additional/ns1/named2.conf.j2 +++ b/bin/tests/system/additional/ns1/named2.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; notify no; minimal-responses no; }; diff --git a/bin/tests/system/additional/ns1/named3.conf.j2 b/bin/tests/system/additional/ns1/named3.conf.j2 index 5635854b419..c16e82eebc1 100644 --- a/bin/tests/system/additional/ns1/named3.conf.j2 +++ b/bin/tests/system/additional/ns1/named3.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; notify no; minimal-any yes; minimal-responses no-auth; diff --git a/bin/tests/system/additional/ns1/named4.conf.j2 b/bin/tests/system/additional/ns1/named4.conf.j2 index 04819375469..6a0c8c4b80d 100644 --- a/bin/tests/system/additional/ns1/named4.conf.j2 +++ b/bin/tests/system/additional/ns1/named4.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; notify no; minimal-responses no-auth-recursive; }; diff --git a/bin/tests/system/additional/ns2/named.conf.j2 b/bin/tests/system/additional/ns2/named.conf.j2 index 4229330f360..258e43b6ec9 100644 --- a/bin/tests/system/additional/ns2/named.conf.j2 +++ b/bin/tests/system/additional/ns2/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; + {% include_indented "_common/options.conf.j2" %} recursion no; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; notify no; minimal-responses yes; dnssec-validation no; diff --git a/bin/tests/system/additional/ns3/named.conf.j2 b/bin/tests/system/additional/ns3/named.conf.j2 index 1b802bb2cf2..8ec3f681678 100644 --- a/bin/tests/system/additional/ns3/named.conf.j2 +++ b/bin/tests/system/additional/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/addzone/ns1/named.conf.j2 b/bin/tests/system/addzone/ns1/named.conf.j2 index fde742af4e6..09f9c44dbd5 100644 --- a/bin/tests/system/addzone/ns1/named.conf.j2 +++ b/bin/tests/system/addzone/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; allow-query { any; }; {% if allownewzones %} diff --git a/bin/tests/system/addzone/ns2/named.conf.j2 b/bin/tests/system/addzone/ns2/named.conf.j2 index 835754d48e2..5f909bcb656 100644 --- a/bin/tests/system/addzone/ns2/named.conf.j2 +++ b/bin/tests/system/addzone/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; recursion no; allow-new-zones yes; diff --git a/bin/tests/system/addzone/ns3/named.conf.j2 b/bin/tests/system/addzone/ns3/named.conf.j2 index 30101ba38c6..2c309069369 100644 --- a/bin/tests/system/addzone/ns3/named.conf.j2 +++ b/bin/tests/system/addzone/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; allow-transfer { any; }; recursion no; diff --git a/bin/tests/system/addzone/ns3/named2.conf.j2 b/bin/tests/system/addzone/ns3/named2.conf.j2 index 7af5d5aa39c..874a47bfc05 100644 --- a/bin/tests/system/addzone/ns3/named2.conf.j2 +++ b/bin/tests/system/addzone/ns3/named2.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; allow-transfer { any; }; recursion no; diff --git a/bin/tests/system/allow_query/ns1/named.conf.j2 b/bin/tests/system/allow_query/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/allow_query/ns1/named.conf.j2 +++ b/bin/tests/system/allow_query/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named.conf.j2 b/bin/tests/system/allow_query/ns2/named.conf.j2 index d21b6bedfe8..038fc32c339 100644 --- a/bin/tests/system/allow_query/ns2/named.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named02.conf.j2 b/bin/tests/system/allow_query/ns2/named02.conf.j2 index 5064d904041..b300cbe2ca9 100644 --- a/bin/tests/system/allow_query/ns2/named02.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named02.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { any; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named03.conf.j2 b/bin/tests/system/allow_query/ns2/named03.conf.j2 index c9597b18ad4..ceacd8992b3 100644 --- a/bin/tests/system/allow_query/ns2/named03.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named03.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { none; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named04.conf.j2 b/bin/tests/system/allow_query/ns2/named04.conf.j2 index fc4dd1ce4f1..96f0581e4f6 100644 --- a/bin/tests/system/allow_query/ns2/named04.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named04.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { 10.53.0.2; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named05.conf.j2 b/bin/tests/system/allow_query/ns2/named05.conf.j2 index 6e59c5bbb10..3d5a7308877 100644 --- a/bin/tests/system/allow_query/ns2/named05.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named05.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { 10.53.0.1; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named06.conf.j2 b/bin/tests/system/allow_query/ns2/named06.conf.j2 index 409312ece3b..a80954685be 100644 --- a/bin/tests/system/allow_query/ns2/named06.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named06.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query {! 10.53.0.2; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named07.conf.j2 b/bin/tests/system/allow_query/ns2/named07.conf.j2 index a8c9ceb9cf4..b2dfcec3787 100644 --- a/bin/tests/system/allow_query/ns2/named07.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named07.conf.j2 @@ -1,13 +1,7 @@ acl accept { 10.53.0.2; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { accept; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named08.conf.j2 b/bin/tests/system/allow_query/ns2/named08.conf.j2 index 2cfae20f8c5..d90a8f5dcc6 100644 --- a/bin/tests/system/allow_query/ns2/named08.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named08.conf.j2 @@ -1,13 +1,7 @@ acl accept { 10.53.0.1; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { accept; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named09.conf.j2 b/bin/tests/system/allow_query/ns2/named09.conf.j2 index 7e4e6a1dbe5..4601cf3b775 100644 --- a/bin/tests/system/allow_query/ns2/named09.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named09.conf.j2 @@ -1,13 +1,7 @@ acl accept { 10.53.0.2; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query {! accept; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named10.conf.j2 b/bin/tests/system/allow_query/ns2/named10.conf.j2 index 1a1735ce228..51f7317853d 100644 --- a/bin/tests/system/allow_query/ns2/named10.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named10.conf.j2 @@ -4,13 +4,7 @@ key one { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { key one; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named11.conf.j2 b/bin/tests/system/allow_query/ns2/named11.conf.j2 index b8f14699712..a6b9fc3a517 100644 --- a/bin/tests/system/allow_query/ns2/named11.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named11.conf.j2 @@ -10,13 +10,7 @@ key two { options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { key one; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named12.conf.j2 b/bin/tests/system/allow_query/ns2/named12.conf.j2 index 2bcda1e31e4..1dd296d7f1c 100644 --- a/bin/tests/system/allow_query/ns2/named12.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named12.conf.j2 @@ -4,13 +4,7 @@ key one { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query {! key one; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named21.conf.j2 b/bin/tests/system/allow_query/ns2/named21.conf.j2 index 0c148056ed8..e4c2eaf634b 100644 --- a/bin/tests/system/allow_query/ns2/named21.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named21.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named22.conf.j2 b/bin/tests/system/allow_query/ns2/named22.conf.j2 index 100f2204b19..2b64844bd60 100644 --- a/bin/tests/system/allow_query/ns2/named22.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named22.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named23.conf.j2 b/bin/tests/system/allow_query/ns2/named23.conf.j2 index 7295b925eb7..fa508308d23 100644 --- a/bin/tests/system/allow_query/ns2/named23.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named23.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named24.conf.j2 b/bin/tests/system/allow_query/ns2/named24.conf.j2 index ad13e050633..1cfbdeb9e99 100644 --- a/bin/tests/system/allow_query/ns2/named24.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named24.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named25.conf.j2 b/bin/tests/system/allow_query/ns2/named25.conf.j2 index beda482e30c..37e24c72656 100644 --- a/bin/tests/system/allow_query/ns2/named25.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named25.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named26.conf.j2 b/bin/tests/system/allow_query/ns2/named26.conf.j2 index eb189ed5134..4af789c6b3a 100644 --- a/bin/tests/system/allow_query/ns2/named26.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named26.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named27.conf.j2 b/bin/tests/system/allow_query/ns2/named27.conf.j2 index 47b8a251fe3..b8e1d4e91c3 100644 --- a/bin/tests/system/allow_query/ns2/named27.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named27.conf.j2 @@ -1,13 +1,7 @@ acl accept { 10.53.0.2; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named28.conf.j2 b/bin/tests/system/allow_query/ns2/named28.conf.j2 index 53a380769a1..53665846b36 100644 --- a/bin/tests/system/allow_query/ns2/named28.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named28.conf.j2 @@ -1,13 +1,7 @@ acl accept { 10.53.0.1; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named29.conf.j2 b/bin/tests/system/allow_query/ns2/named29.conf.j2 index 38190beeb9c..6aa26b9d3a6 100644 --- a/bin/tests/system/allow_query/ns2/named29.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named29.conf.j2 @@ -1,13 +1,7 @@ acl accept { 10.53.0.2; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named30.conf.j2 b/bin/tests/system/allow_query/ns2/named30.conf.j2 index 931d610af1e..77880a85549 100644 --- a/bin/tests/system/allow_query/ns2/named30.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named30.conf.j2 @@ -4,13 +4,7 @@ key one { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named31.conf.j2 b/bin/tests/system/allow_query/ns2/named31.conf.j2 index c66c927b7f0..c26a669c62a 100644 --- a/bin/tests/system/allow_query/ns2/named31.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named31.conf.j2 @@ -10,13 +10,7 @@ key two { options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { key one; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named32.conf.j2 b/bin/tests/system/allow_query/ns2/named32.conf.j2 index 621e78f95db..0bceaf54147 100644 --- a/bin/tests/system/allow_query/ns2/named32.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named32.conf.j2 @@ -4,13 +4,7 @@ key one { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named33.conf.j2 b/bin/tests/system/allow_query/ns2/named33.conf.j2 index 37718e8fb77..1c02e6d4605 100644 --- a/bin/tests/system/allow_query/ns2/named33.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named33.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { none; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named34.conf.j2 b/bin/tests/system/allow_query/ns2/named34.conf.j2 index 5a6a7f16b22..d9196a03264 100644 --- a/bin/tests/system/allow_query/ns2/named34.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named34.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { any; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named40.conf.j2 b/bin/tests/system/allow_query/ns2/named40.conf.j2 index d7aadfcb3ea..1ffefb89097 100644 --- a/bin/tests/system/allow_query/ns2/named40.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named40.conf.j2 @@ -13,13 +13,7 @@ key two { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named53.conf.j2 b/bin/tests/system/allow_query/ns2/named53.conf.j2 index b1625412ceb..666afedb4c7 100644 --- a/bin/tests/system/allow_query/ns2/named53.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named53.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { none; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named54.conf.j2 b/bin/tests/system/allow_query/ns2/named54.conf.j2 index 4cbd2005832..d8181e95b1c 100644 --- a/bin/tests/system/allow_query/ns2/named54.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named54.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query { any; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns2/named55.conf.j2 b/bin/tests/system/allow_query/ns2/named55.conf.j2 index 2e2c0339287..7d010e65177 100644 --- a/bin/tests/system/allow_query/ns2/named55.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named55.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named56.conf.j2 b/bin/tests/system/allow_query/ns2/named56.conf.j2 index 6721e0ad313..a3e67aea9d3 100644 --- a/bin/tests/system/allow_query/ns2/named56.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named56.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named57.conf.j2 b/bin/tests/system/allow_query/ns2/named57.conf.j2 index 578b36a8d3f..9fe197cd23b 100644 --- a/bin/tests/system/allow_query/ns2/named57.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named57.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns3/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2 index 398cd6f8773..1aff3cc7022 100644 --- a/bin/tests/system/allow_query/ns3/named.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2 index ad22b9c8135..9ee2442873e 100644 --- a/bin/tests/system/allow_query/ns3/named2.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { any; }; allow-recursion-on { none; }; allow-query-cache-on { 10.53.0.3; }; diff --git a/bin/tests/system/allow_query/ns3/named6.conf.j2 b/bin/tests/system/allow_query/ns3/named6.conf.j2 index a3934a11687..1343c4faa7a 100644 --- a/bin/tests/system/allow_query/ns3/named6.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named6.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-query-cache { none; }; dnssec-validation no; diff --git a/bin/tests/system/allow_query/ns3/named7.conf.j2 b/bin/tests/system/allow_query/ns3/named7.conf.j2 index a1144ac33a2..d50070019db 100644 --- a/bin/tests/system/allow_query/ns3/named7.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named7.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-recursion { none; }; dnssec-validation no; diff --git a/bin/tests/system/auth/ns1/named.conf.j2 b/bin/tests/system/auth/ns1/named.conf.j2 index b31aaa1a274..77b2d7e614e 100644 --- a/bin/tests/system/auth/ns1/named.conf.j2 +++ b/bin/tests/system/auth/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; send-report-channel "example.rad"; diff --git a/bin/tests/system/auth/ns2/named.conf.j2 b/bin/tests/system/auth/ns2/named.conf.j2 index 32331f0cfb9..9f02cd0de57 100644 --- a/bin/tests/system/auth/ns2/named.conf.j2 +++ b/bin/tests/system/auth/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; }; diff --git a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 index 46629ab8263..130f9493edc 100644 --- a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 index 6fad958c66b..0cbc9a014fc 100644 --- a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/autosign/ns1/named.conf.j2 b/bin/tests/system/autosign/ns1/named.conf.j2 index d706707419a..ff3cb0560a5 100644 --- a/bin/tests/system/autosign/ns1/named.conf.j2 +++ b/bin/tests/system/autosign/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation yes; diff --git a/bin/tests/system/autosign/ns2/named.conf.j2 b/bin/tests/system/autosign/ns2/named.conf.j2 index 916a9d4417b..a09bbcf3d7c 100644 --- a/bin/tests/system/autosign/ns2/named.conf.j2 +++ b/bin/tests/system/autosign/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation yes; diff --git a/bin/tests/system/autosign/ns3/named.conf.j2 b/bin/tests/system/autosign/ns3/named.conf.j2 index 1626da48576..06e13e9bf5d 100644 --- a/bin/tests/system/autosign/ns3/named.conf.j2 +++ b/bin/tests/system/autosign/ns3/named.conf.j2 @@ -1,14 +1,8 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; allow-transfer { any; }; recursion no; dnssec-validation yes; diff --git a/bin/tests/system/autosign/ns4/named.conf.j2 b/bin/tests/system/autosign/ns4/named.conf.j2 index a427603ea0a..53201e9d4a9 100644 --- a/bin/tests/system/autosign/ns4/named.conf.j2 +++ b/bin/tests/system/autosign/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/autosign/ns5/named.conf.j2 b/bin/tests/system/autosign/ns5/named.conf.j2 index 48032d8dbb7..a1774fd5a9e 100644 --- a/bin/tests/system/autosign/ns5/named.conf.j2 +++ b/bin/tests/system/autosign/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/bailiwick/ns4/named.conf.j2 b/bin/tests/system/bailiwick/ns4/named.conf.j2 index fb5bd790764..c3b0e86f05f 100644 --- a/bin/tests/system/bailiwick/ns4/named.conf.j2 +++ b/bin/tests/system/bailiwick/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; qname-minimization off; }; diff --git a/bin/tests/system/builtin/ns1/named.conf.j2 b/bin/tests/system/builtin/ns1/named.conf.j2 index 0586ddf6fd1..0458272f95b 100644 --- a/bin/tests/system/builtin/ns1/named.conf.j2 +++ b/bin/tests/system/builtin/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; }; diff --git a/bin/tests/system/builtin/ns2/named.conf.j2 b/bin/tests/system/builtin/ns2/named.conf.j2 index d4dd416d32e..79092131b78 100644 --- a/bin/tests/system/builtin/ns2/named.conf.j2 +++ b/bin/tests/system/builtin/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; server-id hostname; dnssec-validation no; diff --git a/bin/tests/system/builtin/ns3/named.conf.j2 b/bin/tests/system/builtin/ns3/named.conf.j2 index 58a512a9ff1..6b329bea2b3 100644 --- a/bin/tests/system/builtin/ns3/named.conf.j2 +++ b/bin/tests/system/builtin/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; hostname "this.is.a.test.of.hostname"; server-id "this.is.a.test.of.server-id"; diff --git a/bin/tests/system/cacheclean/ns1/named.conf.j2 b/bin/tests/system/cacheclean/ns1/named.conf.j2 index 598f3c35d31..07516a36bf1 100644 --- a/bin/tests/system/cacheclean/ns1/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2 index 802dcf6f55f..2e5791bf26b 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} disable-empty-zone 127.IN-ADDR.ARPA; dnssec-validation no; diff --git a/bin/tests/system/cacheclean/ns3/named.conf.j2 b/bin/tests/system/cacheclean/ns3/named.conf.j2 index 38f813c1322..ac0b5b2e00d 100644 --- a/bin/tests/system/cacheclean/ns3/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/camp/ns1/named.conf.j2 b/bin/tests/system/camp/ns1/named.conf.j2 index 9f6d74fdbe8..b1e068c3d03 100644 --- a/bin/tests/system/camp/ns1/named.conf.j2 +++ b/bin/tests/system/camp/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/camp/ns2/named.conf.j2 b/bin/tests/system/camp/ns2/named.conf.j2 index 76d2db22ef5..9ba72e4622c 100644 --- a/bin/tests/system/camp/ns2/named.conf.j2 +++ b/bin/tests/system/camp/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/camp/ns3/named.conf.j2 b/bin/tests/system/camp/ns3/named.conf.j2 index 5359e991a7c..28259dca488 100644 --- a/bin/tests/system/camp/ns3/named.conf.j2 +++ b/bin/tests/system/camp/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; max-query-count 150; diff --git a/bin/tests/system/camp/ns9/named.conf.j2 b/bin/tests/system/camp/ns9/named.conf.j2 index c17f25f2ead..5c8365c29a7 100644 --- a/bin/tests/system/camp/ns9/named.conf.j2 +++ b/bin/tests/system/camp/ns9/named.conf.j2 @@ -1,13 +1,7 @@ // NS9 options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; max-recursion-queries 50; diff --git a/bin/tests/system/cap_glues/ns1/named.conf.j2 b/bin/tests/system/cap_glues/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/cap_glues/ns1/named.conf.j2 +++ b/bin/tests/system/cap_glues/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/cap_glues/ns2/named.conf.j2 b/bin/tests/system/cap_glues/ns2/named.conf.j2 index 6f5986d7f0c..b63235273d2 100644 --- a/bin/tests/system/cap_glues/ns2/named.conf.j2 +++ b/bin/tests/system/cap_glues/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/cap_glues/ns3/named.conf.j2 b/bin/tests/system/cap_glues/ns3/named.conf.j2 index f677533bf23..da196ad9f34 100644 --- a/bin/tests/system/cap_glues/ns3/named.conf.j2 +++ b/bin/tests/system/cap_glues/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/case/ns1/named.conf.j2 b/bin/tests/system/case/ns1/named.conf.j2 index 5600daac5b3..4790d65d211 100644 --- a/bin/tests/system/case/ns1/named.conf.j2 +++ b/bin/tests/system/case/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; ixfr-from-differences yes; diff --git a/bin/tests/system/case/ns2/named.conf.j2 b/bin/tests/system/case/ns2/named.conf.j2 index 11a111cd34c..1b135685972 100644 --- a/bin/tests/system/case/ns2/named.conf.j2 +++ b/bin/tests/system/case/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; ixfr-from-differences yes; diff --git a/bin/tests/system/catz/ns1/named.conf.j2 b/bin/tests/system/catz/ns1/named.conf.j2 index 77d14415915..0c7d24855a1 100644 --- a/bin/tests/system/catz/ns1/named.conf.j2 +++ b/bin/tests/system/catz/ns1/named.conf.j2 @@ -1,17 +1,11 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; allow-new-zones yes; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; listen-on port @EXTRAPORT1@ { 10.53.0.1; }; listen-on tls ephemeral { 10.53.0.1; }; - listen-on-v6 { none; }; notify no; notify-delay 0; recursion no; diff --git a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 b/bin/tests/system/cdnxdomain/ns1/named.conf.j2 index c00acaedbbd..ca30edca58e 100644 --- a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 +++ b/bin/tests/system/cdnxdomain/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; servfail-ttl 0; }; diff --git a/bin/tests/system/cdnxdomain/ns2/named.conf.j2 b/bin/tests/system/cdnxdomain/ns2/named.conf.j2 index 4624efedf08..fd46284f617 100644 --- a/bin/tests/system/cdnxdomain/ns2/named.conf.j2 +++ b/bin/tests/system/cdnxdomain/ns2/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/chain/ns1/named.conf.j2 b/bin/tests/system/chain/ns1/named.conf.j2 index 738186cf027..596a1edd33b 100644 --- a/bin/tests/system/chain/ns1/named.conf.j2 +++ b/bin/tests/system/chain/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/chain/ns2/named.conf.j2 b/bin/tests/system/chain/ns2/named.conf.j2 index 2521e21951e..ae49e812734 100644 --- a/bin/tests/system/chain/ns2/named.conf.j2 +++ b/bin/tests/system/chain/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/chain/ns5/named.conf.j2 b/bin/tests/system/chain/ns5/named.conf.j2 index d0888a8ca69..dfc7e3efdad 100644 --- a/bin/tests/system/chain/ns5/named.conf.j2 +++ b/bin/tests/system/chain/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/chase_ds/ns1/named.conf.j2 b/bin/tests/system/chase_ds/ns1/named.conf.j2 index 647a42d8b7c..4dcda49386c 100644 --- a/bin/tests/system/chase_ds/ns1/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/chase_ds/ns2/named.conf.j2 b/bin/tests/system/chase_ds/ns2/named.conf.j2 index a74025b1922..55c99ef8f30 100644 --- a/bin/tests/system/chase_ds/ns2/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/chase_ds/ns3/named.conf.j2 b/bin/tests/system/chase_ds/ns3/named.conf.j2 index 7faf9669c2d..e8f5da5ba1a 100644 --- a/bin/tests/system/chase_ds/ns3/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/checkds/ns1/named.conf.j2 b/bin/tests/system/checkds/ns1/named.conf.j2 index 63222df496c..b8483522c7d 100644 --- a/bin/tests/system/checkds/ns1/named.conf.j2 +++ b/bin/tests/system/checkds/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/checkds/ns10/named.conf.j2 b/bin/tests/system/checkds/ns10/named.conf.j2 index 1f971d3e7df..a8aae77dc53 100644 --- a/bin/tests/system/checkds/ns10/named.conf.j2 +++ b/bin/tests/system/checkds/ns10/named.conf.j2 @@ -1,13 +1,7 @@ // NS10 options { - query-source address 10.53.0.10; - notify-source 10.53.0.10; - transfer-source 10.53.0.10; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.10; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns2/named.conf.j2 b/bin/tests/system/checkds/ns2/named.conf.j2 index d92f1b6fc47..c893b95bec5 100644 --- a/bin/tests/system/checkds/ns2/named.conf.j2 +++ b/bin/tests/system/checkds/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns3/named.conf.j2 b/bin/tests/system/checkds/ns3/named.conf.j2 index 53ea6e909de..c0d82f5fa44 100644 --- a/bin/tests/system/checkds/ns3/named.conf.j2 +++ b/bin/tests/system/checkds/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - query-source address 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; session-keyfile "session.key"; }; diff --git a/bin/tests/system/checkds/ns4/named.conf.j2 b/bin/tests/system/checkds/ns4/named.conf.j2 index 24dd9ea86c6..963b1c0cf25 100644 --- a/bin/tests/system/checkds/ns4/named.conf.j2 +++ b/bin/tests/system/checkds/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns5/named.conf.j2 b/bin/tests/system/checkds/ns5/named.conf.j2 index ceb65eea817..98630361003 100644 --- a/bin/tests/system/checkds/ns5/named.conf.j2 +++ b/bin/tests/system/checkds/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns6/named.conf.j2 b/bin/tests/system/checkds/ns6/named.conf.j2 index 7a1c726b277..b84a62c5d53 100644 --- a/bin/tests/system/checkds/ns6/named.conf.j2 +++ b/bin/tests/system/checkds/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns7/named.conf.j2 b/bin/tests/system/checkds/ns7/named.conf.j2 index ddd5c883d21..c322d6651e2 100644 --- a/bin/tests/system/checkds/ns7/named.conf.j2 +++ b/bin/tests/system/checkds/ns7/named.conf.j2 @@ -1,13 +1,7 @@ // NS7 options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns8/named.conf.j2 b/bin/tests/system/checkds/ns8/named.conf.j2 index 518dfe584c1..a1d9b817abb 100644 --- a/bin/tests/system/checkds/ns8/named.conf.j2 +++ b/bin/tests/system/checkds/ns8/named.conf.j2 @@ -1,13 +1,7 @@ // NS8 options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/checkds/ns9/named.conf.j2 b/bin/tests/system/checkds/ns9/named.conf.j2 index b42d222434c..9ff1e7c149c 100644 --- a/bin/tests/system/checkds/ns9/named.conf.j2 +++ b/bin/tests/system/checkds/ns9/named.conf.j2 @@ -3,13 +3,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation yes; diff --git a/bin/tests/system/checknames/ns1/named.conf.j2 b/bin/tests/system/checknames/ns1/named.conf.j2 index 5587e65956a..f944f382de3 100644 --- a/bin/tests/system/checknames/ns1/named.conf.j2 +++ b/bin/tests/system/checknames/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; check-integrity no; diff --git a/bin/tests/system/checknames/ns2/named.conf.j2 b/bin/tests/system/checknames/ns2/named.conf.j2 index 12762ee1661..898b225a61e 100644 --- a/bin/tests/system/checknames/ns2/named.conf.j2 +++ b/bin/tests/system/checknames/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; check-names response warn; }; diff --git a/bin/tests/system/checknames/ns3/named.conf.j2 b/bin/tests/system/checknames/ns3/named.conf.j2 index 35069dc33ee..58dc7cfacb1 100644 --- a/bin/tests/system/checknames/ns3/named.conf.j2 +++ b/bin/tests/system/checknames/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; check-names response fail; }; diff --git a/bin/tests/system/checknames/ns4/named.conf.j2 b/bin/tests/system/checknames/ns4/named.conf.j2 index 3590f8cb2a2..760105de70e 100644 --- a/bin/tests/system/checknames/ns4/named.conf.j2 +++ b/bin/tests/system/checknames/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; check-names primary ignore; diff --git a/bin/tests/system/checknames/ns5/named.conf.j2 b/bin/tests/system/checknames/ns5/named.conf.j2 index 5637b9d13f4..5e418852e77 100644 --- a/bin/tests/system/checknames/ns5/named.conf.j2 +++ b/bin/tests/system/checknames/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; check-names master ignore; diff --git a/bin/tests/system/cipher_suites/ns1/named.conf.j2 b/bin/tests/system/cipher_suites/ns1/named.conf.j2 index 269f6105b96..8e92f2a7671 100644 --- a/bin/tests/system/cipher_suites/ns1/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns1/named.conf.j2 @@ -33,14 +33,8 @@ tls tls-pfs-chacha20 { }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on-v6 { none; }; - listen-on { 10.53.0.1; }; listen-on tls tls-perfect-forward-secrecy { 10.53.0.1; }; listen-on port @EXTRAPORT1@ tls tls-pfs-aes128 { 10.53.0.1; }; listen-on port @EXTRAPORT2@ tls tls-pfs-aes256 { 10.53.0.1; }; diff --git a/bin/tests/system/cipher_suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2 index b41f5d14261..2cec45e1330 100644 --- a/bin/tests/system/cipher_suites/ns2/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns2/named.conf.j2 @@ -6,15 +6,9 @@ tls local { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; listen-on tls local { 10.53.0.2; }; // DoT - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/cipher_suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2 index 5b92a91369f..cea46eef9be 100644 --- a/bin/tests/system/cipher_suites/ns3/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns3/named.conf.j2 @@ -6,15 +6,9 @@ tls local { }; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; listen-on tls local { 10.53.0.3; }; // DoT - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/cipher_suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2 index a2a4c5deb90..bc31a82a556 100644 --- a/bin/tests/system/cipher_suites/ns4/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns4/named.conf.j2 @@ -6,15 +6,9 @@ tls local { }; options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; listen-on tls local { 10.53.0.4; }; // DoT - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/cipher_suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2 index 5c48278e7d2..d798fb1786c 100644 --- a/bin/tests/system/cipher_suites/ns5/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns5/named.conf.j2 @@ -6,15 +6,9 @@ tls local { }; options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; listen-on tls local { 10.53.0.5; }; // DoT - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/class/ns1/named.conf.j2 b/bin/tests/system/class/ns1/named.conf.j2 index 66ead536c84..a5f5743a94c 100644 --- a/bin/tests/system/class/ns1/named.conf.j2 +++ b/bin/tests/system/class/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/class/ns2/named.conf.j2 b/bin/tests/system/class/ns2/named.conf.j2 index 12f092de039..d5e7a78c5e4 100644 --- a/bin/tests/system/class/ns2/named.conf.j2 +++ b/bin/tests/system/class/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/class/ns3/named.conf.j2 b/bin/tests/system/class/ns3/named.conf.j2 index 5782db2d291..a5f5743a94c 100644 --- a/bin/tests/system/class/ns3/named.conf.j2 +++ b/bin/tests/system/class/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/configloading/ns1/named.conf.j2 b/bin/tests/system/configloading/ns1/named.conf.j2 index d22b644ce83..79bdfddf408 100644 --- a/bin/tests/system/configloading/ns1/named.conf.j2 +++ b/bin/tests/system/configloading/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% set wrongoption = wrongoption | default(False) %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/cookie/ns1/named.conf.j2 b/bin/tests/system/cookie/ns1/named.conf.j2 index 23bc6ee3b2e..3f7ff3bc508 100644 --- a/bin/tests/system/cookie/ns1/named.conf.j2 +++ b/bin/tests/system/cookie/ns1/named.conf.j2 @@ -10,13 +10,7 @@ server 10.53.0.10 { {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% 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"; }; diff --git a/bin/tests/system/cookie/ns2/named.conf.j2 b/bin/tests/system/cookie/ns2/named.conf.j2 index ad9e6a81088..f5c1483f3c5 100644 --- a/bin/tests/system/cookie/ns2/named.conf.j2 +++ b/bin/tests/system/cookie/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; send-cookie yes; diff --git a/bin/tests/system/cookie/ns3/named.conf.j2 b/bin/tests/system/cookie/ns3/named.conf.j2 index f28cc39a73e..12a05a28e22 100644 --- a/bin/tests/system/cookie/ns3/named.conf.j2 +++ b/bin/tests/system/cookie/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% 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"; }; diff --git a/bin/tests/system/cookie/ns4/named.conf.j2 b/bin/tests/system/cookie/ns4/named.conf.j2 index de7897db012..86ef56b942d 100644 --- a/bin/tests/system/cookie/ns4/named.conf.j2 +++ b/bin/tests/system/cookie/ns4/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; cookie-algorithm siphash24; cookie-secret "569d36a6cc27d6bf55502183302ba352"; diff --git a/bin/tests/system/cookie/ns5/named.conf.j2 b/bin/tests/system/cookie/ns5/named.conf.j2 index beb84886c27..d8014516534 100644 --- a/bin/tests/system/cookie/ns5/named.conf.j2 +++ b/bin/tests/system/cookie/ns5/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; cookie-algorithm siphash24; cookie-secret "569d36a6cc27d6bf55502183302ba352"; diff --git a/bin/tests/system/cookie/ns6/named.conf.j2 b/bin/tests/system/cookie/ns6/named.conf.j2 index 2e81e57847a..686dde98cbf 100644 --- a/bin/tests/system/cookie/ns6/named.conf.j2 +++ b/bin/tests/system/cookie/ns6/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; cookie-algorithm siphash24; cookie-secret "6b300e27a0db46d4b046e4189790fa7d"; diff --git a/bin/tests/system/cookie/ns7/named.conf.j2 b/bin/tests/system/cookie/ns7/named.conf.j2 index b1769fd78f3..d714005f779 100644 --- a/bin/tests/system/cookie/ns7/named.conf.j2 +++ b/bin/tests/system/cookie/ns7/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; answer-cookie no; send-cookie yes; diff --git a/bin/tests/system/cookie/ns8/named.conf.j2 b/bin/tests/system/cookie/ns8/named.conf.j2 index 9ad6dbe56ac..b431b819075 100644 --- a/bin/tests/system/cookie/ns8/named.conf.j2 +++ b/bin/tests/system/cookie/ns8/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; rate-limit {}; require-server-cookie yes; diff --git a/bin/tests/system/cpu/ns1/named.conf.j2 b/bin/tests/system/cpu/ns1/named.conf.j2 index fb49f95ab49..a5f5743a94c 100644 --- a/bin/tests/system/cpu/ns1/named.conf.j2 +++ b/bin/tests/system/cpu/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - query-source address 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 b/bin/tests/system/cyclic_glue/ns1/named.conf.j2 index bcc8b544238..3f80a4bbf48 100644 --- a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/cyclic_glue/ns2/named.conf.j2 b/bin/tests/system/cyclic_glue/ns2/named.conf.j2 index 351c53a7be1..5eddc682d0b 100644 --- a/bin/tests/system/cyclic_glue/ns2/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/cyclic_glue/ns3/named.conf.j2 b/bin/tests/system/cyclic_glue/ns3/named.conf.j2 index d8dbea28299..984eae0086c 100644 --- a/bin/tests/system/cyclic_glue/ns3/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 b/bin/tests/system/cyclic_glue/ns4/named.conf.j2 index ea8cb38ee49..cb949796d33 100644 --- a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/database/ns1/named.conf.j2 b/bin/tests/system/database/ns1/named.conf.j2 index 0da97250d65..9eb0406c830 100644 --- a/bin/tests/system/database/ns1/named.conf.j2 +++ b/bin/tests/system/database/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/delegation_ttl/ns1/named.conf.j2 b/bin/tests/system/delegation_ttl/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/delegation_ttl/ns1/named.conf.j2 +++ b/bin/tests/system/delegation_ttl/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 index e80bbda1c67..40a4dab05dd 100644 --- a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 +++ b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 @@ -2,13 +2,7 @@ {% set maxttl = maxttl | default(None) %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; {% if minttl != None %} min-delegation-ttl @minttl@; diff --git a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 b/bin/tests/system/delegdb_flush/ns1/named.conf.j2 index 0e2f8eeac65..b2ebb584016 100644 --- a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 +++ b/bin/tests/system/delegdb_flush/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} max-cache-size 8000; }; diff --git a/bin/tests/system/dns64/ns1/named.conf.j2 b/bin/tests/system/dns64/ns1/named.conf.j2 index 67b8047b057..1078fa8864d 100644 --- a/bin/tests/system/dns64/ns1/named.conf.j2 +++ b/bin/tests/system/dns64/ns1/named.conf.j2 @@ -5,13 +5,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { 10.53.0.1; }; dnssec-validation no; diff --git a/bin/tests/system/dns64/ns1/named2.conf.j2 b/bin/tests/system/dns64/ns1/named2.conf.j2 index 9199422234b..2009ae965cf 100644 --- a/bin/tests/system/dns64/ns1/named2.conf.j2 +++ b/bin/tests/system/dns64/ns1/named2.conf.j2 @@ -5,13 +5,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { 10.53.0.1; }; dnssec-validation no; diff --git a/bin/tests/system/dns64/ns1/named3.conf.j2 b/bin/tests/system/dns64/ns1/named3.conf.j2 index 77b9ed04035..aab22dcd94d 100644 --- a/bin/tests/system/dns64/ns1/named3.conf.j2 +++ b/bin/tests/system/dns64/ns1/named3.conf.j2 @@ -5,13 +5,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { 10.53.0.1; }; dnssec-validation no; }; diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2 index e93c480af9a..54fe2e8fa1c 100644 --- a/bin/tests/system/dns64/ns2/named.conf.j2 +++ b/bin/tests/system/dns64/ns2/named.conf.j2 @@ -3,13 +3,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dns64 2001:aaaa::/96 { diff --git a/bin/tests/system/dns64_dname/ns1/named.conf.j2 b/bin/tests/system/dns64_dname/ns1/named.conf.j2 index c56dac5e1e4..5eea52408bc 100644 --- a/bin/tests/system/dns64_dname/ns1/named.conf.j2 +++ b/bin/tests/system/dns64_dname/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - query-source address 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/dns64_dname/ns2/named.conf.j2 b/bin/tests/system/dns64_dname/ns2/named.conf.j2 index 6939e53d7d9..4dad8ccc611 100644 --- a/bin/tests/system/dns64_dname/ns2/named.conf.j2 +++ b/bin/tests/system/dns64_dname/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - query-source address 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { any; }; dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/dnssec/ns1/named.conf.j2 b/bin/tests/system/dnssec/ns1/named.conf.j2 index cd8c180962f..af73a03e74c 100644 --- a/bin/tests/system/dnssec/ns1/named.conf.j2 +++ b/bin/tests/system/dnssec/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} minimal-any no; minimal-responses no; recursion no; diff --git a/bin/tests/system/dnssec/ns2/named.conf.j2 b/bin/tests/system/dnssec/ns2/named.conf.j2 index db989e26982..8d7a1bafea5 100644 --- a/bin/tests/system/dnssec/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2 index 18420416c48..2fe1c4bac2e 100644 --- a/bin/tests/system/dnssec/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec/ns3/named.conf.j2 @@ -3,13 +3,7 @@ {% set long_sigs = long_sigs | default(False) %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; minimal-any no; minimal-responses yes; diff --git a/bin/tests/system/dnssec/ns4/named.conf.j2 b/bin/tests/system/dnssec/ns4/named.conf.j2 index da418cd0b03..511d82f84ea 100644 --- a/bin/tests/system/dnssec/ns4/named.conf.j2 +++ b/bin/tests/system/dnssec/ns4/named.conf.j2 @@ -6,13 +6,7 @@ {% set multi_view = multi_view | default(False) %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} minimal-any no; minimal-responses no; diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2 index 1622479efb9..9f5ecbb4b48 100644 --- a/bin/tests/system/dnssec/ns6/named.conf.j2 +++ b/bin/tests/system/dnssec/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} minimal-any no; disable-algorithms . { @ALTERNATIVE_ALGORITHM@; }; dnssec-validation yes; diff --git a/bin/tests/system/dnssec/ns9/named.conf.j2 b/bin/tests/system/dnssec/ns9/named.conf.j2 index 32b2c430189..045676c7305 100644 --- a/bin/tests/system/dnssec/ns9/named.conf.j2 +++ b/bin/tests/system/dnssec/ns9/named.conf.j2 @@ -3,13 +3,7 @@ {% set forward_badkey = forward_badkey | default(False) %} options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} minimal-any no; dnssec-validation yes; forward only; diff --git a/bin/tests/system/dnssec_bypass/ns1/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns1/named.conf.j2 index 95ed126990d..f50c5f2f472 100644 --- a/bin/tests/system/dnssec_bypass/ns1/named.conf.j2 +++ b/bin/tests/system/dnssec_bypass/ns1/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/dnssec_bypass/ns2/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns2/named.conf.j2 index a67cce0329a..28c87bda1d1 100644 --- a/bin/tests/system/dnssec_bypass/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_bypass/ns2/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/dnssec_bypass/ns3/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns3/named.conf.j2 index db706fd3fd1..4f721e2636a 100644 --- a/bin/tests/system/dnssec_bypass/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec_bypass/ns3/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 index 83e737e2fe3..385e6a5f614 100644 --- a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 +++ b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation yes; synth-from-dnssec yes; diff --git a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 index dde039ac238..13c820e34e4 100644 --- a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation yes; }; diff --git a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 index adb07d812f5..88d3c7fc946 100644 --- a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; minimal-responses no; qname-minimization off; diff --git a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 index 03420a88013..b23c4296f14 100644 --- a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; trust-anchor-telemetry no; resolver-query-timeout 5000; diff --git a/bin/tests/system/dnssec_py/ns1/named.conf.j2 b/bin/tests/system/dnssec_py/ns1/named.conf.j2 index e33e2f5bdb7..edbf784d756 100644 --- a/bin/tests/system/dnssec_py/ns1/named.conf.j2 +++ b/bin/tests/system/dnssec_py/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address @ns.ip@; - notify-source @ns.ip@; - transfer-source @ns.ip@; - port @PORT@; - pid-file "named.pid"; - listen-on { @ns.ip@; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} key-directory "keys"; diff --git a/bin/tests/system/dnssec_py/ns2/named.conf.j2 b/bin/tests/system/dnssec_py/ns2/named.conf.j2 index ccc1b3a3041..b2e59558eb2 100644 --- a/bin/tests/system/dnssec_py/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_py/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address @ns.ip@; - notify-source @ns.ip@; - transfer-source @ns.ip@; - port @PORT@; - pid-file "named.pid"; - listen-on { @ns.ip@; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} key-directory "keys"; diff --git a/bin/tests/system/dnssec_py/ns3/named.conf.j2 b/bin/tests/system/dnssec_py/ns3/named.conf.j2 index df796cfd12c..5fa2909197e 100644 --- a/bin/tests/system/dnssec_py/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec_py/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address @ns.ip@; - notify-source @ns.ip@; - transfer-source @ns.ip@; - port @PORT@; - pid-file "named.pid"; - listen-on { @ns.ip@; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} key-directory "keys"; diff --git a/bin/tests/system/dnssec_py/ns9/named.conf.j2 b/bin/tests/system/dnssec_py/ns9/named.conf.j2 index 5ceaee01d06..8e2145a0c4c 100644 --- a/bin/tests/system/dnssec_py/ns9/named.conf.j2 +++ b/bin/tests/system/dnssec_py/ns9/named.conf.j2 @@ -3,13 +3,7 @@ {% set max_validations_per_fetch = max_validations_per_fetch | default(16) %} options { - query-source address @ns.ip@; - notify-source @ns.ip@; - transfer-source @ns.ip@; - port @PORT@; - pid-file "named.pid"; - listen-on { @ns.ip@; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 index f0d908eb5b9..78760e5b427 100644 --- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/dnstap/ns1/named.conf.j2 b/bin/tests/system/dnstap/ns1/named.conf.j2 index 7473b63c4ac..e4ad75b0f88 100644 --- a/bin/tests/system/dnstap/ns1/named.conf.j2 +++ b/bin/tests/system/dnstap/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; statistics-file "named.stats"; dnstap-identity "ns1"; diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2 index a4a7e47cf28..d4f9c160bec 100644 --- a/bin/tests/system/dnstap/ns2/named.conf.j2 +++ b/bin/tests/system/dnstap/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; dnstap-identity "ns2"; dnstap-version "xxx"; diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2 index 1c5d0f68ece..ffd76d231e7 100644 --- a/bin/tests/system/dnstap/ns3/named.conf.j2 +++ b/bin/tests/system/dnstap/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnstap-identity "ns3"; dnstap-version "xxx"; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2 index 4526cf63414..1ad087cc59c 100644 --- a/bin/tests/system/dnstap/ns4/named.conf.j2 +++ b/bin/tests/system/dnstap/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnstap-identity "ns4"; dnstap-version "xxx"; dnstap-output unix "dnstap.out"; diff --git a/bin/tests/system/dnstap/ns5/named.conf.j2 b/bin/tests/system/dnstap/ns5/named.conf.j2 index 6d94640eae2..c7658c2ff01 100644 --- a/bin/tests/system/dnstap/ns5/named.conf.j2 +++ b/bin/tests/system/dnstap/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnstap-identity "ns5"; dnstap-version "xxx"; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/doth/ns1/named.conf.j2 b/bin/tests/system/doth/ns1/named.conf.j2 index a1be088691a..cf2672bc7b4 100644 --- a/bin/tests/system/doth/ns1/named.conf.j2 +++ b/bin/tests/system/doth/ns1/named.conf.j2 @@ -52,22 +52,16 @@ tls tls-forward-secrecy-mutual-tls { }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; listen-on tls tls-forward-secrecy { 10.53.0.1; }; // DoT listen-on-v6 tls tls-forward-secrecy { fd92:7065:b8e:ffff::1;}; listen-on tls ephemeral http local { 10.53.0.1; }; // DoH listen-on-v6 tls ephemeral http local { fd92:7065:b8e:ffff::1; }; listen-on tls none http local { 10.53.0.1; }; // unencrypted DoH listen-on-v6 tls none http local { fd92:7065:b8e:ffff::1; }; - listen-on-v6 { none; }; listen-on port @EXTRAPORT1@ tls tls-pfs-aes256 { 10.53.0.1; }; // DoT listen-on-v6 port @EXTRAPORT1@ tls tls-pfs-aes256 { fd92:7065:b8e:ffff::1;}; listen-on port @EXTRAPORT2@ tls tls-no-subject-alt-name { 10.53.0.1; }; // DoT diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2 index 999897d94b5..f074665dda6 100644 --- a/bin/tests/system/doth/ns2/named.conf.j2 +++ b/bin/tests/system/doth/ns2/named.conf.j2 @@ -11,22 +11,16 @@ http local { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; listen-on tls local { 10.53.0.2; }; // DoT listen-on-v6 tls local { fd92:7065:b8e:ffff::2; }; listen-on tls local http local { 10.53.0.2; }; // DoH listen-on-v6 tls local http local { fd92:7065:b8e:ffff::2; }; listen-on tls none http local { 10.53.0.2; }; // unencrypted DoH listen-on-v6 tls none http local { fd92:7065:b8e:ffff::2; }; - listen-on-v6 { none; }; allow-recursion { any; }; allow-query-cache { any; }; allow-recursion-on { 10.53.0.2; }; # allow-query-cache-on inherits; diff --git a/bin/tests/system/doth/ns3/named.conf.j2 b/bin/tests/system/doth/ns3/named.conf.j2 index df5a5eabd4a..c1dc279363e 100644 --- a/bin/tests/system/doth/ns3/named.conf.j2 +++ b/bin/tests/system/doth/ns3/named.conf.j2 @@ -11,17 +11,11 @@ http local { }; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; listen-on tls local { 10.53.0.3; }; // DoT - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/doth/ns4/named.conf.j2 b/bin/tests/system/doth/ns4/named.conf.j2 index ccc282a288b..b1b5d456321 100644 --- a/bin/tests/system/doth/ns4/named.conf.j2 +++ b/bin/tests/system/doth/ns4/named.conf.j2 @@ -18,18 +18,12 @@ http local { }; options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; listen-on tls local { 10.53.0.4; }; // DoT listen-on tls local http local { 10.53.0.4; }; // DoH - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/doth/ns5/named.conf.j2 b/bin/tests/system/doth/ns5/named.conf.j2 index b01983f89e8..d7a094e711a 100644 --- a/bin/tests/system/doth/ns5/named.conf.j2 +++ b/bin/tests/system/doth/ns5/named.conf.j2 @@ -8,16 +8,10 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/dsdigest/ns1/named.conf.j2 b/bin/tests/system/dsdigest/ns1/named.conf.j2 index f283359d738..11f0f0333f0 100644 --- a/bin/tests/system/dsdigest/ns1/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/dsdigest/ns2/named.conf.j2 b/bin/tests/system/dsdigest/ns2/named.conf.j2 index 72d4939f175..783d651a8f7 100644 --- a/bin/tests/system/dsdigest/ns2/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns2/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/dsdigest/ns3/named.conf.j2 b/bin/tests/system/dsdigest/ns3/named.conf.j2 index 22102ae93dc..6c403bb431a 100644 --- a/bin/tests/system/dsdigest/ns3/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns3/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; /* only SHA-256 is enabled */ disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; }; diff --git a/bin/tests/system/dsdigest/ns4/named.conf.j2 b/bin/tests/system/dsdigest/ns4/named.conf.j2 index d9bd797d7ef..ba8ca55dad4 100644 --- a/bin/tests/system/dsdigest/ns4/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns4/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; /* only SHA-256 is enabled */ disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; }; diff --git a/bin/tests/system/ecdsa/ns1/named.conf.j2 b/bin/tests/system/ecdsa/ns1/named.conf.j2 index f283359d738..11f0f0333f0 100644 --- a/bin/tests/system/ecdsa/ns1/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/ecdsa/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2 index 761aa900db8..8bc2a669ea5 100644 --- a/bin/tests/system/ecdsa/ns2/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns2/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/ecdsa/ns3/named.conf.j2 b/bin/tests/system/ecdsa/ns3/named.conf.j2 index 403eb4aac4d..8bc2a669ea5 100644 --- a/bin/tests/system/ecdsa/ns3/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns3/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/eddsa/ns1/named.conf.j2 b/bin/tests/system/eddsa/ns1/named.conf.j2 index f283359d738..11f0f0333f0 100644 --- a/bin/tests/system/eddsa/ns1/named.conf.j2 +++ b/bin/tests/system/eddsa/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/eddsa/ns2/named.conf.j2 b/bin/tests/system/eddsa/ns2/named.conf.j2 index 761aa900db8..8bc2a669ea5 100644 --- a/bin/tests/system/eddsa/ns2/named.conf.j2 +++ b/bin/tests/system/eddsa/ns2/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/eddsa/ns3/named.conf.j2 b/bin/tests/system/eddsa/ns3/named.conf.j2 index 403eb4aac4d..8bc2a669ea5 100644 --- a/bin/tests/system/eddsa/ns3/named.conf.j2 +++ b/bin/tests/system/eddsa/ns3/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/ede24/ns1/named.conf.j2 b/bin/tests/system/ede24/ns1/named.conf.j2 index 5f07e5b810f..979cdbf5337 100644 --- a/bin/tests/system/ede24/ns1/named.conf.j2 +++ b/bin/tests/system/ede24/ns1/named.conf.j2 @@ -1,13 +1,7 @@ options { - port @PORT@; - query-source address 10.53.0.1; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - transfer-source 10.53.0.1; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} recursion no; also-notify { 10.53.0.2 port @PORT@; }; - notify-source 10.53.0.1; }; zone "foo.fr" { diff --git a/bin/tests/system/ede24/ns2/named.conf.j2 b/bin/tests/system/ede24/ns2/named.conf.j2 index 27e3b71296f..6650d31f864 100644 --- a/bin/tests/system/ede24/ns2/named.conf.j2 +++ b/bin/tests/system/ede24/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - port @PORT@; - query-source address 10.53.0.2; - notify-source 10.53.0.2; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - transfer-source 10.53.0.2; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.j2 b/bin/tests/system/ednscompliance/ns1/named.conf.j2 index 1c10d0fce2c..ffe83e7741f 100644 --- a/bin/tests/system/ednscompliance/ns1/named.conf.j2 +++ b/bin/tests/system/ednscompliance/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; server-id "ns1"; diff --git a/bin/tests/system/emptyzones/ns1/named.conf.j2 b/bin/tests/system/emptyzones/ns1/named.conf.j2 index 3c358ddc7f6..0fc5fff6351 100644 --- a/bin/tests/system/emptyzones/ns1/named.conf.j2 +++ b/bin/tests/system/emptyzones/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% 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"; }; diff --git a/bin/tests/system/enginepkcs11/ns1/named.conf.j2 b/bin/tests/system/enginepkcs11/ns1/named.conf.j2 index f3c1180cd4b..df534720e44 100644 --- a/bin/tests/system/enginepkcs11/ns1/named.conf.j2 +++ b/bin/tests/system/enginepkcs11/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 b/bin/tests/system/enginepkcs11/ns2/named.conf.j2 index 8e46b4b7924..672812d87d0 100644 --- a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 +++ b/bin/tests/system/enginepkcs11/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/expiredglue/ns1/named.conf.j2 b/bin/tests/system/expiredglue/ns1/named.conf.j2 index 42dba75f869..e67326a1a75 100644 --- a/bin/tests/system/expiredglue/ns1/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/expiredglue/ns2/named.conf.j2 b/bin/tests/system/expiredglue/ns2/named.conf.j2 index d0b75bf8657..1b47dbf9bdd 100644 --- a/bin/tests/system/expiredglue/ns2/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/expiredglue/ns3/named.conf.j2 b/bin/tests/system/expiredglue/ns3/named.conf.j2 index f83df484965..bb1a28329ec 100644 --- a/bin/tests/system/expiredglue/ns3/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/expiredglue/ns4/named.conf.j2 b/bin/tests/system/expiredglue/ns4/named.conf.j2 index ba3847fca1d..3b2e2068ab8 100644 --- a/bin/tests/system/expiredglue/ns4/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.j2 b/bin/tests/system/fetchlimit/ns1/named.conf.j2 index d1b6dd85824..948df008475 100644 --- a/bin/tests/system/fetchlimit/ns1/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.j2 b/bin/tests/system/fetchlimit/ns2/named.conf.j2 index 6f5e7da2963..b3fcb60f94a 100644 --- a/bin/tests/system/fetchlimit/ns2/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2 index 36dc9af7449..faa0d733f8e 100644 --- a/bin/tests/system/fetchlimit/ns3/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; fetches-per-server 400; }; diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 index a81b834b3d0..64f08b0e6de 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; fetches-per-zone 40; }; diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 index 76e87e31c7f..e269fe3e4e8 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursive-clients 400; }; diff --git a/bin/tests/system/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2 index dab43bdf2a6..02be4a30653 100644 --- a/bin/tests/system/fetchlimit/ns5/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; clients-per-query 5; max-clients-per-query 10; diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 index 8127018695c..146746addd5 100644 --- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 index 855befe3f96..4c524681cf6 100644 --- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/formerr/ns1/named.conf.j2 b/bin/tests/system/formerr/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/formerr/ns1/named.conf.j2 +++ b/bin/tests/system/formerr/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/forward/ns10/named.conf.j2 b/bin/tests/system/forward/ns10/named.conf.j2 index 815d92305a1..2a2a444c127 100644 --- a/bin/tests/system/forward/ns10/named.conf.j2 +++ b/bin/tests/system/forward/ns10/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.10; - notify-source 10.53.0.10; - transfer-source 10.53.0.10; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.10; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} minimal-responses no; dnssec-validation no; }; diff --git a/bin/tests/system/forward/ns4/named.conf.j2 b/bin/tests/system/forward/ns4/named.conf.j2 index a333a15772b..071e4187fef 100644 --- a/bin/tests/system/forward/ns4/named.conf.j2 +++ b/bin/tests/system/forward/ns4/named.conf.j2 @@ -3,13 +3,7 @@ include "named-tls.conf"; {% endif %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; minimal-responses yes; diff --git a/bin/tests/system/forward/ns5/named.conf.j2 b/bin/tests/system/forward/ns5/named.conf.j2 index bf7ce3cb528..f93ddceaf03 100644 --- a/bin/tests/system/forward/ns5/named.conf.j2 +++ b/bin/tests/system/forward/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} forward only; forwarders { 10.53.0.4; }; deny-answer-aliases { "rebind"; }; diff --git a/bin/tests/system/forward/ns7/named.conf.j2 b/bin/tests/system/forward/ns7/named.conf.j2 index fc392c37d4f..40e4b2463f0 100644 --- a/bin/tests/system/forward/ns7/named.conf.j2 +++ b/bin/tests/system/forward/ns7/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} forwarders { 10.53.0.4; }; forward first; dnssec-validation no; diff --git a/bin/tests/system/forward/ns8/named.conf.j2 b/bin/tests/system/forward/ns8/named.conf.j2 index 0d44e5f900a..1d7a266ff4a 100644 --- a/bin/tests/system/forward/ns8/named.conf.j2 +++ b/bin/tests/system/forward/ns8/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} forwarders { 10.53.0.2; }; // returns referrals forward first; dnssec-validation no; diff --git a/bin/tests/system/forward/ns9/named.conf.j2 b/bin/tests/system/forward/ns9/named.conf.j2 index f481a351e5c..a49d8d42874 100644 --- a/bin/tests/system/forward/ns9/named.conf.j2 +++ b/bin/tests/system/forward/ns9/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; edns-udp-size 1232; }; diff --git a/bin/tests/system/forward/ns9/named2.conf.j2 b/bin/tests/system/forward/ns9/named2.conf.j2 index 2649ddc11d1..673a2778921 100644 --- a/bin/tests/system/forward/ns9/named2.conf.j2 +++ b/bin/tests/system/forward/ns9/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; edns-udp-size 1232; }; diff --git a/bin/tests/system/forward/ns9/named3.conf.j2 b/bin/tests/system/forward/ns9/named3.conf.j2 index cd91ad737b4..6186195d743 100644 --- a/bin/tests/system/forward/ns9/named3.conf.j2 +++ b/bin/tests/system/forward/ns9/named3.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; edns-udp-size 1232; forward only; diff --git a/bin/tests/system/forward/ns9/named4.conf.j2 b/bin/tests/system/forward/ns9/named4.conf.j2 index a5c5ccaccdd..5c5b6606aa2 100644 --- a/bin/tests/system/forward/ns9/named4.conf.j2 +++ b/bin/tests/system/forward/ns9/named4.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; edns-udp-size 1232; }; diff --git a/bin/tests/system/fwdfirst/ns4/named.conf.j2 b/bin/tests/system/fwdfirst/ns4/named.conf.j2 index 930b9332e0c..59881ddbd60 100644 --- a/bin/tests/system/fwdfirst/ns4/named.conf.j2 +++ b/bin/tests/system/fwdfirst/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; allow-recursion { any; }; dnssec-validation no; diff --git a/bin/tests/system/fwdfirst/ns5/named.conf.j2 b/bin/tests/system/fwdfirst/ns5/named.conf.j2 index 50f5057e22a..4b7f2689c16 100644 --- a/bin/tests/system/fwdfirst/ns5/named.conf.j2 +++ b/bin/tests/system/fwdfirst/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; allow-recursion { any; }; dnssec-validation no; diff --git a/bin/tests/system/glue/ns1/named.conf.j2 b/bin/tests/system/glue/ns1/named.conf.j2 index e20991b82ad..d4c11772a20 100644 --- a/bin/tests/system/glue/ns1/named.conf.j2 +++ b/bin/tests/system/glue/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; }; diff --git a/bin/tests/system/gluecache/ns1/named.conf.j2 b/bin/tests/system/gluecache/ns1/named.conf.j2 index 0925df31b6e..40d1168cf57 100644 --- a/bin/tests/system/gluecache/ns1/named.conf.j2 +++ b/bin/tests/system/gluecache/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation no; diff --git a/bin/tests/system/hooks/ns1/named.conf.j2 b/bin/tests/system/hooks/ns1/named.conf.j2 index 52328b14ce3..2a36f279ab2 100644 --- a/bin/tests/system/hooks/ns1/named.conf.j2 +++ b/bin/tests/system/hooks/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% set noextension = noextension | default(False) %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/hooks/ns2/named.conf.j2 b/bin/tests/system/hooks/ns2/named.conf.j2 index c93eb283328..53fc0e51a80 100644 --- a/bin/tests/system/hooks/ns2/named.conf.j2 +++ b/bin/tests/system/hooks/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; minimal-responses no; diff --git a/bin/tests/system/host/ns1/named.conf.j2 b/bin/tests/system/host/ns1/named.conf.j2 index 3a5a0a02752..3f6dbb2be38 100644 --- a/bin/tests/system/host/ns1/named.conf.j2 +++ b/bin/tests/system/host/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 index 4de2cfcd95a..87adc58a133 100644 --- a/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 +++ b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation no; diff --git a/bin/tests/system/inline/ns1/named.conf.j2 b/bin/tests/system/inline/ns1/named.conf.j2 index 5fd586624b6..aa07b3bcf39 100644 --- a/bin/tests/system/inline/ns1/named.conf.j2 +++ b/bin/tests/system/inline/ns1/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation yes; diff --git a/bin/tests/system/inline/ns2/named.conf.j2 b/bin/tests/system/inline/ns2/named.conf.j2 index 97189bae039..df67432e540 100644 --- a/bin/tests/system/inline/ns2/named.conf.j2 +++ b/bin/tests/system/inline/ns2/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; notify-delay 0; diff --git a/bin/tests/system/inline/ns3/named.conf.j2 b/bin/tests/system/inline/ns3/named.conf.j2 index 0e4e1836373..5828f5baa75 100644 --- a/bin/tests/system/inline/ns3/named.conf.j2 +++ b/bin/tests/system/inline/ns3/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-transfer { any; }; try-tcp-refresh no; diff --git a/bin/tests/system/inline/ns4/named.conf.j2 b/bin/tests/system/inline/ns4/named.conf.j2 index 3aac0658899..abd5972016e 100644 --- a/bin/tests/system/inline/ns4/named.conf.j2 +++ b/bin/tests/system/inline/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; notify-delay 0; diff --git a/bin/tests/system/inline/ns5/named.conf.j2 b/bin/tests/system/inline/ns5/named.conf.j2 index 71b05a4d457..536ca3867a3 100644 --- a/bin/tests/system/inline/ns5/named.conf.j2 +++ b/bin/tests/system/inline/ns5/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; notify-delay 0; diff --git a/bin/tests/system/inline/ns5/named2.conf.j2 b/bin/tests/system/inline/ns5/named2.conf.j2 index 8283a54c1de..b42934f7ad5 100644 --- a/bin/tests/system/inline/ns5/named2.conf.j2 +++ b/bin/tests/system/inline/ns5/named2.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; notify-delay 0; diff --git a/bin/tests/system/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2 index 8a37c83c146..18bfaac55ed 100644 --- a/bin/tests/system/inline/ns6/named.conf.j2 +++ b/bin/tests/system/inline/ns6/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify-delay 0; dnssec-validation yes; }; diff --git a/bin/tests/system/inline/ns7/named.conf.j2 b/bin/tests/system/inline/ns7/named.conf.j2 index 859bf1cf033..1ee42edea76 100644 --- a/bin/tests/system/inline/ns7/named.conf.j2 +++ b/bin/tests/system/inline/ns7/named.conf.j2 @@ -17,13 +17,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; notify no; diff --git a/bin/tests/system/inline/ns8/named.conf.j2 b/bin/tests/system/inline/ns8/named.conf.j2 index 03a116a57ec..c35b9e4c50b 100644 --- a/bin/tests/system/inline/ns8/named.conf.j2 +++ b/bin/tests/system/inline/ns8/named.conf.j2 @@ -3,14 +3,8 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; recursion no; try-tcp-refresh no; notify-delay 0; diff --git a/bin/tests/system/integrity/ns1/named.conf.j2 b/bin/tests/system/integrity/ns1/named.conf.j2 index f4fe79f430c..f55bb75d543 100644 --- a/bin/tests/system/integrity/ns1/named.conf.j2 +++ b/bin/tests/system/integrity/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/ixfr/ns1/named.conf.j2 b/bin/tests/system/ixfr/ns1/named.conf.j2 index 4f7b29c9858..2e4aeb6d177 100644 --- a/bin/tests/system/ixfr/ns1/named.conf.j2 +++ b/bin/tests/system/ixfr/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/ixfr/ns3/named.conf.j2 b/bin/tests/system/ixfr/ns3/named.conf.j2 index 474375416d6..e246721c03f 100644 --- a/bin/tests/system/ixfr/ns3/named.conf.j2 +++ b/bin/tests/system/ixfr/ns3/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/ixfr/ns4/named.conf.j2 b/bin/tests/system/ixfr/ns4/named.conf.j2 index 0b7c5c009cb..405d773c974 100644 --- a/bin/tests/system/ixfr/ns4/named.conf.j2 +++ b/bin/tests/system/ixfr/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/ixfr/ns5/named.conf.j2 b/bin/tests/system/ixfr/ns5/named.conf.j2 index 80ce8a28ecc..f436da16c5d 100644 --- a/bin/tests/system/ixfr/ns5/named.conf.j2 +++ b/bin/tests/system/ixfr/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; provide-ixfr no; diff --git a/bin/tests/system/journal/ns1/named.conf.j2 b/bin/tests/system/journal/ns1/named.conf.j2 index 16a92ad5fe2..5e89dbb7f87 100644 --- a/bin/tests/system/journal/ns1/named.conf.j2 +++ b/bin/tests/system/journal/ns1/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; dnssec-validation auto; minimal-responses no; recursion no; diff --git a/bin/tests/system/journal/ns2/named.conf.j2 b/bin/tests/system/journal/ns2/named.conf.j2 index b22f6fd370e..7a3516c6995 100644 --- a/bin/tests/system/journal/ns2/named.conf.j2 +++ b/bin/tests/system/journal/ns2/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; dnssec-validation auto; minimal-responses no; recursion no; diff --git a/bin/tests/system/kasp/ns1/named.conf.j2 b/bin/tests/system/kasp/ns1/named.conf.j2 index fc603c9e18d..fe8c500e614 100644 --- a/bin/tests/system/kasp/ns1/named.conf.j2 +++ b/bin/tests/system/kasp/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; allow-transfer { any; }; }; diff --git a/bin/tests/system/kasp/ns2/named.conf.j2 b/bin/tests/system/kasp/ns2/named.conf.j2 index d6b5e93f4fc..0fe78779b5e 100644 --- a/bin/tests/system/kasp/ns2/named.conf.j2 +++ b/bin/tests/system/kasp/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-policy "none"; diff --git a/bin/tests/system/kasp/ns3/named-common.conf.j2 b/bin/tests/system/kasp/ns3/named-common.conf.j2 index cf5b063a2a3..6e1a8ed19fc 100644 --- a/bin/tests/system/kasp/ns3/named-common.conf.j2 +++ b/bin/tests/system/kasp/ns3/named-common.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-policy "rsasha256"; diff --git a/bin/tests/system/kasp/ns4/named.conf.j2 b/bin/tests/system/kasp/ns4/named.conf.j2 index c1a21851d42..6448765803c 100644 --- a/bin/tests/system/kasp/ns4/named.conf.j2 +++ b/bin/tests/system/kasp/ns4/named.conf.j2 @@ -41,13 +41,7 @@ dnssec-policy "test" { }; options { - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - query-source address 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-policy "test"; diff --git a/bin/tests/system/kasp/ns5/named.conf.j2 b/bin/tests/system/kasp/ns5/named.conf.j2 index 246df51f043..6500900b86b 100644 --- a/bin/tests/system/kasp/ns5/named.conf.j2 +++ b/bin/tests/system/kasp/ns5/named.conf.j2 @@ -24,13 +24,7 @@ dnssec-policy "test" { }; options { - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - query-source address 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-policy "none"; diff --git a/bin/tests/system/kasp/ns6/named.conf.j2 b/bin/tests/system/kasp/ns6/named.conf.j2 index e77a9ddf5b1..0e9a884c269 100644 --- a/bin/tests/system/kasp/ns6/named.conf.j2 +++ b/bin/tests/system/kasp/ns6/named.conf.j2 @@ -4,13 +4,7 @@ include "policies/kasp.conf"; include "policies/csk1.conf"; options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; key-directory "."; diff --git a/bin/tests/system/keepalive/ns1/named.conf.j2 b/bin/tests/system/keepalive/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/keepalive/ns1/named.conf.j2 +++ b/bin/tests/system/keepalive/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/keepalive/ns2/named.conf.j2 b/bin/tests/system/keepalive/ns2/named.conf.j2 index 1d6ef54ec48..e4e9efd42e3 100644 --- a/bin/tests/system/keepalive/ns2/named.conf.j2 +++ b/bin/tests/system/keepalive/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} send-cookie yes; tcp-advertised-timeout 150; dnssec-validation no; diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2 index a233dd247d0..a9bbe5c9133 100644 --- a/bin/tests/system/keepalive/ns3/named.conf.j2 +++ b/bin/tests/system/keepalive/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/ksr/ns1/named.conf.j2 b/bin/tests/system/ksr/ns1/named.conf.j2 index b0f3c8706eb..1e9d3eb1cbf 100644 --- a/bin/tests/system/ksr/ns1/named.conf.j2 +++ b/bin/tests/system/ksr/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/legacy/ns1/named.conf.j2 b/bin/tests/system/legacy/ns1/named.conf.j2 index 418801fda6e..edbe8313640 100644 --- a/bin/tests/system/legacy/ns1/named.conf.j2 +++ b/bin/tests/system/legacy/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% set dnssec_validation = dnssec_validation | default("no") %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation @dnssec_validation@; }; diff --git a/bin/tests/system/legacy/ns10/named.conf.j2 b/bin/tests/system/legacy/ns10/named.conf.j2 index 094e6f14e15..7f886480991 100644 --- a/bin/tests/system/legacy/ns10/named.conf.j2 +++ b/bin/tests/system/legacy/ns10/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.10; - notify-source 10.53.0.10; - transfer-source 10.53.0.10; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.10; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns2/named.conf.j2 b/bin/tests/system/legacy/ns2/named.conf.j2 index 38a165bbd37..cdd2c09166d 100644 --- a/bin/tests/system/legacy/ns2/named.conf.j2 +++ b/bin/tests/system/legacy/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns3/named.conf.j2 b/bin/tests/system/legacy/ns3/named.conf.j2 index 1a77304d632..559bdf252cf 100644 --- a/bin/tests/system/legacy/ns3/named.conf.j2 +++ b/bin/tests/system/legacy/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns4/named.conf.j2 b/bin/tests/system/legacy/ns4/named.conf.j2 index e90fa7f8dd2..971d4e1d317 100644 --- a/bin/tests/system/legacy/ns4/named.conf.j2 +++ b/bin/tests/system/legacy/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns5/named.conf.j2 b/bin/tests/system/legacy/ns5/named.conf.j2 index 7f84ed4a3ce..38f6f0dda41 100644 --- a/bin/tests/system/legacy/ns5/named.conf.j2 +++ b/bin/tests/system/legacy/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns6/named.conf.j2 b/bin/tests/system/legacy/ns6/named.conf.j2 index 340f0665747..cae957a559b 100644 --- a/bin/tests/system/legacy/ns6/named.conf.j2 +++ b/bin/tests/system/legacy/ns6/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns7/named.conf.j2 b/bin/tests/system/legacy/ns7/named.conf.j2 index d141a6366c8..65907508d0c 100644 --- a/bin/tests/system/legacy/ns7/named.conf.j2 +++ b/bin/tests/system/legacy/ns7/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns8/named.conf.j2 b/bin/tests/system/legacy/ns8/named.conf.j2 index 4a759fcd5d3..2dbffa65a8a 100644 --- a/bin/tests/system/legacy/ns8/named.conf.j2 +++ b/bin/tests/system/legacy/ns8/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/legacy/ns9/named.conf.j2 b/bin/tests/system/legacy/ns9/named.conf.j2 index 21843140738..730c98f631a 100644 --- a/bin/tests/system/legacy/ns9/named.conf.j2 +++ b/bin/tests/system/legacy/ns9/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/limits/ns1/named.conf.j2 b/bin/tests/system/limits/ns1/named.conf.j2 index c9dfa410a96..9774b7ec0c4 100644 --- a/bin/tests/system/limits/ns1/named.conf.j2 +++ b/bin/tests/system/limits/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 index 4e81f26d082..dd2a95f700d 100644 --- a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 index cb25c10c58e..f927b80fd16 100644 --- a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 index 415c9ad1f5b..e9f8122deb7 100644 --- a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 index 2131bb0c4cb..5d896b06e7c 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 index 427609862fa..56b54780c77 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 index d4dd9c607fd..ac1c0359041 100644 --- a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 index 20116e380ed..3d88f40810d 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 index 5980f7e4966..fda38e63ba2 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 index 1ede6c1f512..fbbc66180dc 100644 --- a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 index 33feb6d9beb..db37240c6aa 100644 --- a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 index aafd275f29f..83139ad351f 100644 --- a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 index 6350c251057..2accce0b4e6 100644 --- a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/masterfile/ns1/named.conf.j2 b/bin/tests/system/masterfile/ns1/named.conf.j2 index 469dab78c47..e7db5269dc2 100644 --- a/bin/tests/system/masterfile/ns1/named.conf.j2 +++ b/bin/tests/system/masterfile/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/masterfile/ns2/named.conf.j2 b/bin/tests/system/masterfile/ns2/named.conf.j2 index 464cbde1189..e556e97d586 100644 --- a/bin/tests/system/masterfile/ns2/named.conf.j2 +++ b/bin/tests/system/masterfile/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/masterformat/ns1/named.conf.j2 b/bin/tests/system/masterformat/ns1/named.conf.j2 index 3d4f4538af2..e48899938e5 100644 --- a/bin/tests/system/masterformat/ns1/named.conf.j2 +++ b/bin/tests/system/masterformat/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - port @PORT@; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; session-keyfile "session.key"; diff --git a/bin/tests/system/masterformat/ns2/named.conf.j2 b/bin/tests/system/masterformat/ns2/named.conf.j2 index 5f35b8c58af..a388cb75d3b 100644 --- a/bin/tests/system/masterformat/ns2/named.conf.j2 +++ b/bin/tests/system/masterformat/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; servfail-ttl 0; diff --git a/bin/tests/system/masterformat/ns3/named.conf.j2 b/bin/tests/system/masterformat/ns3/named.conf.j2 index 77ab423e7dc..e0ca869764a 100644 --- a/bin/tests/system/masterformat/ns3/named.conf.j2 +++ b/bin/tests/system/masterformat/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - port @PORT@; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation no; diff --git a/bin/tests/system/masterformat/ns4/named.conf.j2 b/bin/tests/system/masterformat/ns4/named.conf.j2 index f10a44f90e2..29ec9abc93c 100644 --- a/bin/tests/system/masterformat/ns4/named.conf.j2 +++ b/bin/tests/system/masterformat/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - port @PORT@; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; session-keyfile "session.key"; diff --git a/bin/tests/system/masterformat/ns4/named2.conf.j2 b/bin/tests/system/masterformat/ns4/named2.conf.j2 index 8c41db2db99..7c1440ef89e 100644 --- a/bin/tests/system/masterformat/ns4/named2.conf.j2 +++ b/bin/tests/system/masterformat/ns4/named2.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - port @PORT@; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; session-keyfile "session.key"; diff --git a/bin/tests/system/migrate2kasp/ns3/named.conf.j2 b/bin/tests/system/migrate2kasp/ns3/named.conf.j2 index a78c1c5dc46..fb968681297 100644 --- a/bin/tests/system/migrate2kasp/ns3/named.conf.j2 +++ b/bin/tests/system/migrate2kasp/ns3/named.conf.j2 @@ -3,13 +3,7 @@ include "kasp.conf"; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 b/bin/tests/system/migrate2kasp/ns4/named.conf.j2 index 2c4c9623061..b2836b28be6 100644 --- a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 +++ b/bin/tests/system/migrate2kasp/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; key-directory "."; diff --git a/bin/tests/system/minimalresponses/ns1/named.conf.j2 b/bin/tests/system/minimalresponses/ns1/named.conf.j2 index fd2ee857681..4fe7071a362 100644 --- a/bin/tests/system/minimalresponses/ns1/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% set minresp = minresp | default("yes") %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/minimalresponses/ns2/named.conf.j2 b/bin/tests/system/minimalresponses/ns2/named.conf.j2 index 8367e1eae46..0d41326a7a6 100644 --- a/bin/tests/system/minimalresponses/ns2/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% set minresp = minresp | default("yes") %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-responses @minresp@; diff --git a/bin/tests/system/minimalresponses/ns3/named.conf.j2 b/bin/tests/system/minimalresponses/ns3/named.conf.j2 index fab85796083..c7128cd60cf 100644 --- a/bin/tests/system/minimalresponses/ns3/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% set minresp = minresp | default("yes") %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/minimalresponses/ns4/named.conf.j2 b/bin/tests/system/minimalresponses/ns4/named.conf.j2 index 4dfba0ce5f0..2ebff3c1ce9 100644 --- a/bin/tests/system/minimalresponses/ns4/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2 @@ -1,13 +1,7 @@ {% set minresp = minresp | default("yes") %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; minimal-responses @minresp@; }; diff --git a/bin/tests/system/mirror/ns1/named.conf.j2 b/bin/tests/system/mirror/ns1/named.conf.j2 index bcb8c46c7d4..bc531023d68 100644 --- a/bin/tests/system/mirror/ns1/named.conf.j2 +++ b/bin/tests/system/mirror/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/mirror/ns2/named.conf.j2 b/bin/tests/system/mirror/ns2/named.conf.j2 index 2d82ba105c0..9d11e2ee3d8 100644 --- a/bin/tests/system/mirror/ns2/named.conf.j2 +++ b/bin/tests/system/mirror/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/mirror/ns3/named.conf.j2 b/bin/tests/system/mirror/ns3/named.conf.j2 index c45d1904f3c..693ba93f4f8 100644 --- a/bin/tests/system/mirror/ns3/named.conf.j2 +++ b/bin/tests/system/mirror/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query-cache { 10.53.0.1; }; trust-anchor-telemetry yes; allow-new-zones yes; diff --git a/bin/tests/system/mismatchtcp/ns1/named.conf.j2 b/bin/tests/system/mismatchtcp/ns1/named.conf.j2 index 6c4f912f4d3..8cbd7935643 100644 --- a/bin/tests/system/mismatchtcp/ns1/named.conf.j2 +++ b/bin/tests/system/mismatchtcp/ns1/named.conf.j2 @@ -14,13 +14,7 @@ {% include "_common/controls.conf.j2" %} options { - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - query-source address 10.53.0.1; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/mkeys/ns1/named.conf.j2 b/bin/tests/system/mkeys/ns1/named.conf.j2 index 6da24a56d38..bff9cb6a4ed 100644 --- a/bin/tests/system/mkeys/ns1/named.conf.j2 +++ b/bin/tests/system/mkeys/ns1/named.conf.j2 @@ -6,13 +6,7 @@ acl allowed { }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation no; diff --git a/bin/tests/system/mkeys/ns1/named2.conf.j2 b/bin/tests/system/mkeys/ns1/named2.conf.j2 index 6da24a56d38..bff9cb6a4ed 100644 --- a/bin/tests/system/mkeys/ns1/named2.conf.j2 +++ b/bin/tests/system/mkeys/ns1/named2.conf.j2 @@ -6,13 +6,7 @@ acl allowed { }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation no; diff --git a/bin/tests/system/mkeys/ns1/named3.conf.j2 b/bin/tests/system/mkeys/ns1/named3.conf.j2 index ab3ec88ff96..218c2f18dc9 100644 --- a/bin/tests/system/mkeys/ns1/named3.conf.j2 +++ b/bin/tests/system/mkeys/ns1/named3.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation no; diff --git a/bin/tests/system/mkeys/ns2/named.conf.j2 b/bin/tests/system/mkeys/ns2/named.conf.j2 index 01b3c0501a7..d16a02c327c 100644 --- a/bin/tests/system/mkeys/ns2/named.conf.j2 +++ b/bin/tests/system/mkeys/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation auto; servfail-ttl 0; diff --git a/bin/tests/system/mkeys/ns3/named.conf.j2 b/bin/tests/system/mkeys/ns3/named.conf.j2 index 1e62a70f8c1..970878a1403 100644 --- a/bin/tests/system/mkeys/ns3/named.conf.j2 +++ b/bin/tests/system/mkeys/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation auto; trust-anchor-telemetry no; diff --git a/bin/tests/system/mkeys/ns4/named.conf.j2 b/bin/tests/system/mkeys/ns4/named.conf.j2 index cc0673ec2cd..1b28bc3243b 100644 --- a/bin/tests/system/mkeys/ns4/named.conf.j2 +++ b/bin/tests/system/mkeys/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation auto; managed-keys-directory "nope"; diff --git a/bin/tests/system/mkeys/ns5/named.conf.j2 b/bin/tests/system/mkeys/ns5/named.conf.j2 index 05d65e2d644..89a40a5279b 100644 --- a/bin/tests/system/mkeys/ns5/named.conf.j2 +++ b/bin/tests/system/mkeys/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation auto; servfail-ttl 0; diff --git a/bin/tests/system/mkeys/ns6/named.conf.j2 b/bin/tests/system/mkeys/ns6/named.conf.j2 index d55054a84e9..a8da3412af8 100644 --- a/bin/tests/system/mkeys/ns6/named.conf.j2 +++ b/bin/tests/system/mkeys/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation auto; trust-anchor-telemetry no; diff --git a/bin/tests/system/mkeys/ns7/named.conf.j2 b/bin/tests/system/mkeys/ns7/named.conf.j2 index f7c2486dc3b..e2eaa065b03 100644 --- a/bin/tests/system/mkeys/ns7/named.conf.j2 +++ b/bin/tests/system/mkeys/ns7/named.conf.j2 @@ -1,13 +1,7 @@ // NS7 options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation auto; }; diff --git a/bin/tests/system/multisigner/ns1/named.conf.j2 b/bin/tests/system/multisigner/ns1/named.conf.j2 index eccb9fa2d3c..e896318ee49 100644 --- a/bin/tests/system/multisigner/ns1/named.conf.j2 +++ b/bin/tests/system/multisigner/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/multisigner/ns2/named.conf.j2 b/bin/tests/system/multisigner/ns2/named.conf.j2 index 95cd4a70aee..42a649d586b 100644 --- a/bin/tests/system/multisigner/ns2/named.conf.j2 +++ b/bin/tests/system/multisigner/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; allow-notify { 10.53.0.3; 10.53.0.4; }; dnssec-validation no; diff --git a/bin/tests/system/multisigner/ns3/named.conf.j2 b/bin/tests/system/multisigner/ns3/named.conf.j2 index 40bf9bd1e44..05553bfd8db 100644 --- a/bin/tests/system/multisigner/ns3/named.conf.j2 +++ b/bin/tests/system/multisigner/ns3/named.conf.j2 @@ -3,13 +3,7 @@ include "../kasp.conf"; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; key-directory "."; dnssec-validation yes; diff --git a/bin/tests/system/multisigner/ns4/named.conf.j2 b/bin/tests/system/multisigner/ns4/named.conf.j2 index d72bdec0051..d949a390966 100644 --- a/bin/tests/system/multisigner/ns4/named.conf.j2 +++ b/bin/tests/system/multisigner/ns4/named.conf.j2 @@ -3,13 +3,7 @@ include "../kasp.conf"; options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; key-directory "."; dnssec-validation yes; diff --git a/bin/tests/system/multisigner/ns5/named.conf.j2 b/bin/tests/system/multisigner/ns5/named.conf.j2 index dffde83ad8b..0774490484b 100644 --- a/bin/tests/system/multisigner/ns5/named.conf.j2 +++ b/bin/tests/system/multisigner/ns5/named.conf.j2 @@ -3,13 +3,7 @@ include "../kasp.conf"; options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; key-directory "."; dnssec-validation no; diff --git a/bin/tests/system/names/ns1/named.conf.j2 b/bin/tests/system/names/ns1/named.conf.j2 index 5f4045e7cee..94a29055d85 100644 --- a/bin/tests/system/names/ns1/named.conf.j2 +++ b/bin/tests/system/names/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; ixfr-from-differences yes; check-integrity no; diff --git a/bin/tests/system/notify/ns1/named.conf.j2 b/bin/tests/system/notify/ns1/named.conf.j2 index 115f59ee887..1c5627ed5db 100644 --- a/bin/tests/system/notify/ns1/named.conf.j2 +++ b/bin/tests/system/notify/ns1/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; + {% include_indented "_common/options.conf.j2" %} # invalid notify-source-v6 address notify-source-v6 fd92:7065:b8e:fffe::a35:5; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2 index 684f9f16bc8..994d9b2fb38 100644 --- a/bin/tests/system/notify/ns2/named.conf.j2 +++ b/bin/tests/system/notify/ns2/named.conf.j2 @@ -3,14 +3,8 @@ include "named-tls.conf"; {% endif %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; + {% include_indented "_common/options.conf.j2" %} notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; allow-transfer { any; }; recursion no; startup-notify-rate 5; diff --git a/bin/tests/system/notify/ns5/named.conf.j2 b/bin/tests/system/notify/ns5/named.conf.j2 index bfc2609cbfd..a11ac03855f 100644 --- a/bin/tests/system/notify/ns5/named.conf.j2 +++ b/bin/tests/system/notify/ns5/named.conf.j2 @@ -14,13 +14,7 @@ key "c" { }; options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; }; diff --git a/bin/tests/system/nsec/ns1/named.conf.j2 b/bin/tests/system/nsec/ns1/named.conf.j2 index 07a1de53def..585a87b6ebf 100644 --- a/bin/tests/system/nsec/ns1/named.conf.j2 +++ b/bin/tests/system/nsec/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/nsec/ns2/named.conf.j2 b/bin/tests/system/nsec/ns2/named.conf.j2 index bf56e7ee777..ec7248af388 100644 --- a/bin/tests/system/nsec/ns2/named.conf.j2 +++ b/bin/tests/system/nsec/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/nsec/ns3/named.conf.j2 b/bin/tests/system/nsec/ns3/named.conf.j2 index b4d71749323..5e7c3ecd982 100644 --- a/bin/tests/system/nsec/ns3/named.conf.j2 +++ b/bin/tests/system/nsec/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; max-records-per-type 2; diff --git a/bin/tests/system/nsec3/ns2/named.conf.j2 b/bin/tests/system/nsec3/ns2/named.conf.j2 index a1195e9e663..170704b0206 100644 --- a/bin/tests/system/nsec3/ns2/named.conf.j2 +++ b/bin/tests/system/nsec3/ns2/named.conf.j2 @@ -5,13 +5,7 @@ dnssec-policy "nsec3" { }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nsec3/ns3/named-common.conf.j2 b/bin/tests/system/nsec3/ns3/named-common.conf.j2 index 9e980b4e2b3..63938fc7079 100644 --- a/bin/tests/system/nsec3/ns3/named-common.conf.j2 +++ b/bin/tests/system/nsec3/ns3/named-common.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nsec3/ns4/named.conf.j2 b/bin/tests/system/nsec3/ns4/named.conf.j2 index 83a3e1bb3c9..7a00e92f2f0 100644 --- a/bin/tests/system/nsec3/ns4/named.conf.j2 +++ b/bin/tests/system/nsec3/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nsec3/ns5/named.conf.j2 b/bin/tests/system/nsec3/ns5/named.conf.j2 index cadf4348508..a41db29701e 100644 --- a/bin/tests/system/nsec3/ns5/named.conf.j2 +++ b/bin/tests/system/nsec3/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation yes; send-cookie no; diff --git a/bin/tests/system/nsec3/ns6/named.conf.j2 b/bin/tests/system/nsec3/ns6/named.conf.j2 index 7be0738383a..909fdd457c1 100644 --- a/bin/tests/system/nsec3/ns6/named.conf.j2 +++ b/bin/tests/system/nsec3/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 index 5e5f1b50984..7193ba0e48b 100644 --- a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 +++ b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 index af3f31fe676..9a34387e777 100644 --- a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 index fcd565149e0..648462e320f 100644 --- a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 +++ b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 index 62f7af3d5d2..9583664915c 100644 --- a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 index 8a3892d1fb9..6b6a72a30fc 100644 --- a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 index fbd80cb1771..8e79c395f08 100644 --- a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 +++ b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; synth-from-dnssec yes; }; diff --git a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 index ee3e3a47542..8b6e1bad2ee 100644 --- a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // validating resolver options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; synth-from-dnssec yes; }; diff --git a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 index fda5b0a574d..75c7de27ecf 100644 --- a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 +++ b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2 index a14fedbb4e7..3175cc6c78f 100644 --- a/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 index 306425dd685..b1e285930c0 100644 --- a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 @@ -13,13 +13,7 @@ {% set maxdelegationservers = maxdelegationservers | default(None) %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/nslookup/ns1/named.conf.j2 b/bin/tests/system/nslookup/ns1/named.conf.j2 index 3a5a0a02752..3f6dbb2be38 100644 --- a/bin/tests/system/nslookup/ns1/named.conf.j2 +++ b/bin/tests/system/nslookup/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 index 42dba75f869..e67326a1a75 100644 --- a/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 index d0b75bf8657..1b47dbf9bdd 100644 --- a/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 index bca15ee2ee8..0868ddd59c9 100644 --- a/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 index f9f1535550f..a98b247f3a8 100644 --- a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 @@ -1,13 +1,7 @@ {% set maxdelegationservers = maxdelegationservers | default(None) %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/nsupdate/ns10/named.conf.j2 b/bin/tests/system/nsupdate/ns10/named.conf.j2 index 1ac4f6dfbeb..1d870364acd 100644 --- a/bin/tests/system/nsupdate/ns10/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns10/named.conf.j2 @@ -1,14 +1,8 @@ options { - query-source address 10.53.0.10; - notify-source 10.53.0.10; - transfer-source 10.53.0.10; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; session-keyfile "session.key"; - listen-on { 10.53.0.10; }; listen-on tls ephemeral { 10.53.0.10; }; - listen-on-v6 { none; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns2/named.conf.j2 b/bin/tests/system/nsupdate/ns2/named.conf.j2 index 2264cff2c80..8a3bcf6c014 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} serial-query-rate 1; // workaround for KB AA-01213 dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns3/named.conf.j2 b/bin/tests/system/nsupdate/ns3/named.conf.j2 index 29724fe1d97..307990d78cf 100644 --- a/bin/tests/system/nsupdate/ns3/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/nsupdate/ns5/named.conf.j2 b/bin/tests/system/nsupdate/ns5/named.conf.j2 index 3fc8db03708..e7c6b38b74f 100644 --- a/bin/tests/system/nsupdate/ns5/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns5/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns7/named.conf.j2 b/bin/tests/system/nsupdate/ns7/named.conf.j2 index 9f986a5bb41..816a6edd899 100644 --- a/bin/tests/system/nsupdate/ns7/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns7/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns7/named2.conf.j2 b/bin/tests/system/nsupdate/ns7/named2.conf.j2 index a799536ff8d..3f1826a706d 100644 --- a/bin/tests/system/nsupdate/ns7/named2.conf.j2 +++ b/bin/tests/system/nsupdate/ns7/named2.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns8/named.conf.j2 b/bin/tests/system/nsupdate/ns8/named.conf.j2 index bf811f7c18a..0b65b70a7a2 100644 --- a/bin/tests/system/nsupdate/ns8/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns8/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns9/named.conf.j2 b/bin/tests/system/nsupdate/ns9/named.conf.j2 index f50b4a52a16..e8e25be4481 100644 --- a/bin/tests/system/nsupdate/ns9/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns9/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/nta/ns1/named.conf.j2 b/bin/tests/system/nta/ns1/named.conf.j2 index 0249014a635..c53084e4ecd 100644 --- a/bin/tests/system/nta/ns1/named.conf.j2 +++ b/bin/tests/system/nta/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; /* test that we can turn off trust-anchor-telemetry */ diff --git a/bin/tests/system/nta/ns2/named.conf.j2 b/bin/tests/system/nta/ns2/named.conf.j2 index f2d0182279b..fc663a2c6bd 100644 --- a/bin/tests/system/nta/ns2/named.conf.j2 +++ b/bin/tests/system/nta/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; notify-delay 1; diff --git a/bin/tests/system/nta/ns3/named.conf.j2 b/bin/tests/system/nta/ns3/named.conf.j2 index 9af076aefb0..8c5ee71fc31 100644 --- a/bin/tests/system/nta/ns3/named.conf.j2 +++ b/bin/tests/system/nta/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nta/ns4/named.conf.j2 b/bin/tests/system/nta/ns4/named.conf.j2 index 885a7da507d..98321e1c0d0 100644 --- a/bin/tests/system/nta/ns4/named.conf.j2 +++ b/bin/tests/system/nta/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} minimal-responses no; nta-lifetime 12s; diff --git a/bin/tests/system/nta/ns9/named.conf.j2 b/bin/tests/system/nta/ns9/named.conf.j2 index 2ebdb317959..05e67fc09bb 100644 --- a/bin/tests/system/nta/ns9/named.conf.j2 +++ b/bin/tests/system/nta/ns9/named.conf.j2 @@ -1,13 +1,7 @@ // NS9 options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; forward only; forwarders { 10.53.0.4; }; diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.j2 b/bin/tests/system/nzd2nzf/ns1/named.conf.j2 index 2af6468871c..05ee7368ba9 100644 --- a/bin/tests/system/nzd2nzf/ns1/named.conf.j2 +++ b/bin/tests/system/nzd2nzf/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; recursion no; allow-new-zones yes; diff --git a/bin/tests/system/optout/ns2/named.conf.j2 b/bin/tests/system/optout/ns2/named.conf.j2 index 4e8ed8ed6ea..62563116add 100644 --- a/bin/tests/system/optout/ns2/named.conf.j2 +++ b/bin/tests/system/optout/ns2/named.conf.j2 @@ -2,13 +2,7 @@ {% set policy = "optout" if not reconfiged else "nsec" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/padding/ns1/named.conf.j2 b/bin/tests/system/padding/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/padding/ns1/named.conf.j2 +++ b/bin/tests/system/padding/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/padding/ns2/named.conf.j2 b/bin/tests/system/padding/ns2/named.conf.j2 index dce128fc23a..9ebf12d913f 100644 --- a/bin/tests/system/padding/ns2/named.conf.j2 +++ b/bin/tests/system/padding/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} send-cookie yes; response-padding { !10.53.0.8; any; } block-size 64; dnssec-validation no; diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2 index 503ae8c0253..7ee3f0183e0 100644 --- a/bin/tests/system/padding/ns3/named.conf.j2 +++ b/bin/tests/system/padding/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2 index 0077edf19b8..3b94e5ff432 100644 --- a/bin/tests/system/padding/ns4/named.conf.j2 +++ b/bin/tests/system/padding/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/pending/ns1/named.conf.j2 b/bin/tests/system/pending/ns1/named.conf.j2 index 1b6058a1e5b..f09714e9637 100644 --- a/bin/tests/system/pending/ns1/named.conf.j2 +++ b/bin/tests/system/pending/ns1/named.conf.j2 @@ -1,13 +1,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/pending/ns2/named.conf.j2 b/bin/tests/system/pending/ns2/named.conf.j2 index f7d805741a7..78cf1ae21c6 100644 --- a/bin/tests/system/pending/ns2/named.conf.j2 +++ b/bin/tests/system/pending/ns2/named.conf.j2 @@ -3,13 +3,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/pending/ns3/named.conf.j2 b/bin/tests/system/pending/ns3/named.conf.j2 index 3443c5cbee9..34a912d5e14 100644 --- a/bin/tests/system/pending/ns3/named.conf.j2 +++ b/bin/tests/system/pending/ns3/named.conf.j2 @@ -3,13 +3,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; dnssec-validation yes; diff --git a/bin/tests/system/pending/ns4/named.conf.j2 b/bin/tests/system/pending/ns4/named.conf.j2 index e66e158f1c3..3a3d770f99a 100644 --- a/bin/tests/system/pending/ns4/named.conf.j2 +++ b/bin/tests/system/pending/ns4/named.conf.j2 @@ -1,13 +1,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/pipelined/ns1/named.conf.j2 b/bin/tests/system/pipelined/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/pipelined/ns1/named.conf.j2 +++ b/bin/tests/system/pipelined/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2 index 723755fed29..c5cf78303f4 100644 --- a/bin/tests/system/pipelined/ns2/named.conf.j2 +++ b/bin/tests/system/pipelined/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2 index c25a777c42d..92fea51cea9 100644 --- a/bin/tests/system/pipelined/ns3/named.conf.j2 +++ b/bin/tests/system/pipelined/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2 index 57069ab5bce..74a532e9d32 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.j2 +++ b/bin/tests/system/pipelined/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/qmin/ns1/named.conf.j2 b/bin/tests/system/qmin/ns1/named.conf.j2 index 7542ace9237..00b154fb119 100644 --- a/bin/tests/system/qmin/ns1/named.conf.j2 +++ b/bin/tests/system/qmin/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/qmin/ns5/named.conf.j2 b/bin/tests/system/qmin/ns5/named.conf.j2 index 051f63106cd..3a1ba825b3a 100644 --- a/bin/tests/system/qmin/ns5/named.conf.j2 +++ b/bin/tests/system/qmin/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} qname-minimization disabled; querylog yes; resolver-query-timeout 30000; # 30 seconds diff --git a/bin/tests/system/qmin/ns6/named.conf.j2 b/bin/tests/system/qmin/ns6/named.conf.j2 index 6318d4c3e48..35052b289e5 100644 --- a/bin/tests/system/qmin/ns6/named.conf.j2 +++ b/bin/tests/system/qmin/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} qname-minimization strict; querylog yes; resolver-query-timeout 30000; # 30 seconds diff --git a/bin/tests/system/qmin/ns7/named.conf.j2 b/bin/tests/system/qmin/ns7/named.conf.j2 index 12f65d0472e..765a4e3801c 100644 --- a/bin/tests/system/qmin/ns7/named.conf.j2 +++ b/bin/tests/system/qmin/ns7/named.conf.j2 @@ -1,13 +1,7 @@ // NS7 options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} qname-minimization relaxed; querylog yes; resolver-query-timeout 30000; # 30 seconds diff --git a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 index 8b7a93cc3ae..efa381e6064 100644 --- a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 +++ b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 @@ -14,13 +14,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/randomizens/ns1/named.conf.j2 b/bin/tests/system/randomizens/ns1/named.conf.j2 index 07a1de53def..585a87b6ebf 100644 --- a/bin/tests/system/randomizens/ns1/named.conf.j2 +++ b/bin/tests/system/randomizens/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/randomizens/ns2/named.conf.j2 b/bin/tests/system/randomizens/ns2/named.conf.j2 index c90ca4a92b8..4726d243827 100644 --- a/bin/tests/system/randomizens/ns2/named.conf.j2 +++ b/bin/tests/system/randomizens/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/randomizens/ns3/named.conf.j2 b/bin/tests/system/randomizens/ns3/named.conf.j2 index 042f5d9e589..5a5d33f4491 100644 --- a/bin/tests/system/randomizens/ns3/named.conf.j2 +++ b/bin/tests/system/randomizens/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/randomizens/ns4/named.conf.j2 b/bin/tests/system/randomizens/ns4/named.conf.j2 index a5b2bfd1f64..4bb200bf938 100644 --- a/bin/tests/system/randomizens/ns4/named.conf.j2 +++ b/bin/tests/system/randomizens/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/randomizens/ns5/named.conf.j2 b/bin/tests/system/randomizens/ns5/named.conf.j2 index ca2976322d8..834fb2b935f 100644 --- a/bin/tests/system/randomizens/ns5/named.conf.j2 +++ b/bin/tests/system/randomizens/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/randomizens/ns6/named.conf.j2 b/bin/tests/system/randomizens/ns6/named.conf.j2 index da1a169fc71..d74ec52867b 100644 --- a/bin/tests/system/randomizens/ns6/named.conf.j2 +++ b/bin/tests/system/randomizens/ns6/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/reclimit/ns1/named.conf.j2 b/bin/tests/system/reclimit/ns1/named.conf.j2 index 850c437d3ec..8b7ab800ad6 100644 --- a/bin/tests/system/reclimit/ns1/named.conf.j2 +++ b/bin/tests/system/reclimit/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; max-records-per-type 0; diff --git a/bin/tests/system/reclimit/ns3/named.conf.j2 b/bin/tests/system/reclimit/ns3/named.conf.j2 index 1a4c5a46130..918f3ca6782 100644 --- a/bin/tests/system/reclimit/ns3/named.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; qname-minimization disabled; max-recursion-queries 50; diff --git a/bin/tests/system/reclimit/ns3/named2.conf.j2 b/bin/tests/system/reclimit/ns3/named2.conf.j2 index c106324b5a1..8f3dee5c2b9 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; qname-minimization disabled; max-recursion-depth 5; diff --git a/bin/tests/system/reclimit/ns3/named3.conf.j2 b/bin/tests/system/reclimit/ns3/named3.conf.j2 index 7d27c387319..74c5e45abae 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named3.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; qname-minimization disabled; max-recursion-depth 100; diff --git a/bin/tests/system/reclimit/ns3/named4.conf.j2 b/bin/tests/system/reclimit/ns3/named4.conf.j2 index ec5a56062b5..81793614224 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named4.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; qname-minimization disabled; max-recursion-depth 100; diff --git a/bin/tests/system/reclimit/ns3/named5.conf.j2 b/bin/tests/system/reclimit/ns3/named5.conf.j2 index 934290685d8..88e90509acc 100644 --- a/bin/tests/system/reclimit/ns3/named5.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named5.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; qname-minimization disabled; max-recursion-depth 12; diff --git a/bin/tests/system/reclimit/ns3/named6.conf.j2 b/bin/tests/system/reclimit/ns3/named6.conf.j2 index c296961f1d2..97b631bc2dc 100644 --- a/bin/tests/system/reclimit/ns3/named6.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named6.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; qname-minimization disabled; max-recursion-depth 12; diff --git a/bin/tests/system/redirect/ns1/named.conf.j2 b/bin/tests/system/redirect/ns1/named.conf.j2 index fbc72562184..4c214c8e2db 100644 --- a/bin/tests/system/redirect/ns1/named.conf.j2 +++ b/bin/tests/system/redirect/ns1/named.conf.j2 @@ -3,13 +3,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { 10.53.0.1; }; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns10/named.conf.j2 b/bin/tests/system/redirect/ns10/named.conf.j2 index 37e036c5d08..cf4a24ce814 100644 --- a/bin/tests/system/redirect/ns10/named.conf.j2 +++ b/bin/tests/system/redirect/ns10/named.conf.j2 @@ -3,13 +3,7 @@ // locally, then nxdomain-redirect+dns64 hit the same buggy path as ns7). options { - query-source address 10.53.0.10; - notify-source 10.53.0.10; - transfer-source 10.53.0.10; - port @PORT@; - listen-on { 10.53.0.10; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} nxdomain-redirect redirect; dnssec-validation yes; synth-from-dnssec yes; diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2 index 975ecf22357..fc8b394c4c5 100644 --- a/bin/tests/system/redirect/ns2/named.conf.j2 +++ b/bin/tests/system/redirect/ns2/named.conf.j2 @@ -3,13 +3,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns3/named.conf.j2 b/bin/tests/system/redirect/ns3/named.conf.j2 index a92d2cf63e8..74d2ff1a0cc 100644 --- a/bin/tests/system/redirect/ns3/named.conf.j2 +++ b/bin/tests/system/redirect/ns3/named.conf.j2 @@ -1,13 +1,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-recursion { 10.53.0.3; }; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns5/named.conf.j2 b/bin/tests/system/redirect/ns5/named.conf.j2 index 2af413e3f74..a4bb12c45d4 100644 --- a/bin/tests/system/redirect/ns5/named.conf.j2 +++ b/bin/tests/system/redirect/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} nxdomain-redirect signed; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns6/named.conf.j2 b/bin/tests/system/redirect/ns6/named.conf.j2 index 618b89f0249..94048681700 100644 --- a/bin/tests/system/redirect/ns6/named.conf.j2 +++ b/bin/tests/system/redirect/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} nxdomain-redirect unsigned; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns7/named.conf.j2 b/bin/tests/system/redirect/ns7/named.conf.j2 index b5e2aaef382..7feed000e05 100644 --- a/bin/tests/system/redirect/ns7/named.conf.j2 +++ b/bin/tests/system/redirect/ns7/named.conf.j2 @@ -1,13 +1,7 @@ // NS7 options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} nxdomain-redirect redirect; dnssec-validation no; dns64 64:ff9b::/96 { diff --git a/bin/tests/system/redirect/ns8/named.conf.j2 b/bin/tests/system/redirect/ns8/named.conf.j2 index 4c67fb8b5e8..cf0513c0bbf 100644 --- a/bin/tests/system/redirect/ns8/named.conf.j2 +++ b/bin/tests/system/redirect/ns8/named.conf.j2 @@ -1,13 +1,7 @@ // NS8 options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} nxdomain-redirect redirect; dnssec-validation no; dns64 64:ff9b::/96 { diff --git a/bin/tests/system/redirect/ns9/named.conf.j2 b/bin/tests/system/redirect/ns9/named.conf.j2 index 11329fd04c8..7d5e9eb831d 100644 --- a/bin/tests/system/redirect/ns9/named.conf.j2 +++ b/bin/tests/system/redirect/ns9/named.conf.j2 @@ -2,13 +2,7 @@ // (synth-from-dnssec path) options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/resend_loop/ns1/named.conf.j2 b/bin/tests/system/resend_loop/ns1/named.conf.j2 index 2ca78bca60c..09c9069f5f3 100644 --- a/bin/tests/system/resend_loop/ns1/named.conf.j2 +++ b/bin/tests/system/resend_loop/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-query { any; }; forwarders { 10.53.0.3 port @PORT@; }; forward only; diff --git a/bin/tests/system/resend_loop/ns4/named.conf.j2 b/bin/tests/system/resend_loop/ns4/named.conf.j2 index 873c4a39514..cc8c54320e6 100644 --- a/bin/tests/system/resend_loop/ns4/named.conf.j2 +++ b/bin/tests/system/resend_loop/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} query-source-v6 none; dnssec-validation no; }; diff --git a/bin/tests/system/resolver/ns1/named.conf.j2 b/bin/tests/system/resolver/ns1/named.conf.j2 index 734f2d4da5c..4d154401c3a 100644 --- a/bin/tests/system/resolver/ns1/named.conf.j2 +++ b/bin/tests/system/resolver/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% 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"; }; diff --git a/bin/tests/system/resolver/ns1/named2.conf.j2 b/bin/tests/system/resolver/ns1/named2.conf.j2 index ccc6c1bf564..b2d5b677b52 100644 --- a/bin/tests/system/resolver/ns1/named2.conf.j2 +++ b/bin/tests/system/resolver/ns1/named2.conf.j2 @@ -1,13 +1,7 @@ {% set wrongoption = wrongoption | default(False) %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; attach-cache "globalcache"; max-zone-ttl unlimited; diff --git a/bin/tests/system/resolver/ns11/named.conf.j2 b/bin/tests/system/resolver/ns11/named.conf.j2 index ccccce2ba03..7be9c72cc81 100644 --- a/bin/tests/system/resolver/ns11/named.conf.j2 +++ b/bin/tests/system/resolver/ns11/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.11; - notify-source 10.53.0.11; - transfer-source 10.53.0.11; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.11; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-any no; diff --git a/bin/tests/system/resolver/ns4/named.conf.j2 b/bin/tests/system/resolver/ns4/named.conf.j2 index 29933d7f694..1ccf4b20d9a 100644 --- a/bin/tests/system/resolver/ns4/named.conf.j2 +++ b/bin/tests/system/resolver/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-any no; diff --git a/bin/tests/system/resolver/ns5/named.conf.j2 b/bin/tests/system/resolver/ns5/named.conf.j2 index 854f27b4fd9..7a49c2e431a 100644 --- a/bin/tests/system/resolver/ns5/named.conf.j2 +++ b/bin/tests/system/resolver/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; querylog yes; prefetch 4 10; diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2 index 11c80492980..0c467e63d01 100644 --- a/bin/tests/system/rndc/ns2/named.conf.j2 +++ b/bin/tests/system/rndc/ns2/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/rndc/ns3/named.conf.j2 b/bin/tests/system/rndc/ns3/named.conf.j2 index e54733d9599..ee725b83a6a 100644 --- a/bin/tests/system/rndc/ns3/named.conf.j2 +++ b/bin/tests/system/rndc/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/rndc/ns4/named.conf.j2 b/bin/tests/system/rndc/ns4/named.conf.j2 index d1bee45bece..ecbe49bc00e 100644 --- a/bin/tests/system/rndc/ns4/named.conf.j2 +++ b/bin/tests/system/rndc/ns4/named.conf.j2 @@ -1,12 +1,6 @@ /* deliberately not _common/controls.conf.j2: setup.sh appends a runtime-generated multi-key channel on EXTRAPORT7 */ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2 index a65f3f8bc39..435453eec40 100644 --- a/bin/tests/system/rndc/ns5/named.conf.j2 +++ b/bin/tests/system/rndc/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/rndc/ns6/named.conf.j2 b/bin/tests/system/rndc/ns6/named.conf.j2 index 21f62ff31db..9669d811419 100644 --- a/bin/tests/system/rndc/ns6/named.conf.j2 +++ b/bin/tests/system/rndc/ns6/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/rndc/ns7/named.conf.j2 b/bin/tests/system/rndc/ns7/named.conf.j2 index be7984e3430..5e9bbfa632d 100644 --- a/bin/tests/system/rndc/ns7/named.conf.j2 +++ b/bin/tests/system/rndc/ns7/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/rollover/ns1/named.conf.j2 b/bin/tests/system/rollover/ns1/named.conf.j2 index f50e6320928..e6d08533f4f 100644 --- a/bin/tests/system/rollover/ns1/named.conf.j2 +++ b/bin/tests/system/rollover/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/rollover/ns2/named.conf.j2 b/bin/tests/system/rollover/ns2/named.conf.j2 index 009f1b9c487..45d16d1f366 100644 --- a/bin/tests/system/rollover/ns2/named.conf.j2 +++ b/bin/tests/system/rollover/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; allow-notify { 10.53.0.3; }; recursion no; diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2 index 6d06280562d..f94c07d81ad 100644 --- a/bin/tests/system/rollover/ns3/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns3/named.common.conf.j2 @@ -7,13 +7,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation @dnssec_validation@; notify-cfg CDS { notify yes; }; diff --git a/bin/tests/system/rollover/ns4/named.common.conf.j2 b/bin/tests/system/rollover/ns4/named.common.conf.j2 index 5fac1717c21..e744591d323 100644 --- a/bin/tests/system/rollover/ns4/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns4/named.common.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 index 647a42d8b7c..4dcda49386c 100644 --- a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 index d6cc29764be..894616e87dd 100644 --- a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 index d1819558a3e..10485eeb0c0 100644 --- a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; root-key-sentinel yes; }; diff --git a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 index bb3cf6fa678..42d3852ac89 100644 --- a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 +++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; root-key-sentinel no; }; diff --git a/bin/tests/system/rpz/ns1/named.conf.j2 b/bin/tests/system/rpz/ns1/named.conf.j2 index 332dfd5e87e..47fd660e0ed 100644 --- a/bin/tests/system/rpz/ns1/named.conf.j2 +++ b/bin/tests/system/rpz/ns1/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; allow-transfer { any; }; notify no; minimal-any no; diff --git a/bin/tests/system/rpz/ns10/named.conf.j2 b/bin/tests/system/rpz/ns10/named.conf.j2 index 2797e5e1380..f58181b1652 100644 --- a/bin/tests/system/rpz/ns10/named.conf.j2 +++ b/bin/tests/system/rpz/ns10/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.10; - notify-source 10.53.0.10; - transfer-source 10.53.0.10; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.10; }; - listen-on-v6 { none; }; allow-transfer { any; }; notify no; minimal-any no; diff --git a/bin/tests/system/rpz/ns2/named.conf.j2 b/bin/tests/system/rpz/ns2/named.conf.j2 index 54d95c6cbac..1bb33e9d630 100644 --- a/bin/tests/system/rpz/ns2/named.conf.j2 +++ b/bin/tests/system/rpz/ns2/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; allow-transfer { any; }; notify no; minimal-any no; diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2 index 028c75f67a8..fce1fde48a9 100644 --- a/bin/tests/system/rpz/ns3/named.conf.j2 +++ b/bin/tests/system/rpz/ns3/named.conf.j2 @@ -5,15 +5,9 @@ {% set bad_dlz = bad_dlz | default(False) %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; session-keyfile "session.key"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; allow-transfer { any; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/rpz/ns4/named.conf.j2 b/bin/tests/system/rpz/ns4/named.conf.j2 index 29e7e259262..783bac8b7e5 100644 --- a/bin/tests/system/rpz/ns4/named.conf.j2 +++ b/bin/tests/system/rpz/ns4/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; allow-transfer { any; }; notify no; minimal-any no; diff --git a/bin/tests/system/rpz/ns5/named.conf.j2 b/bin/tests/system/rpz/ns5/named.conf.j2 index 0270ec31d3c..2811e4be4e7 100644 --- a/bin/tests/system/rpz/ns5/named.conf.j2 +++ b/bin/tests/system/rpz/ns5/named.conf.j2 @@ -3,15 +3,9 @@ */ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; session-keyfile "session.key"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; allow-transfer { any; }; ixfr-from-differences yes; notify-delay 0; diff --git a/bin/tests/system/rpz/ns6/named.conf.j2 b/bin/tests/system/rpz/ns6/named.conf.j2 index a40145f9113..6181f9eea70 100644 --- a/bin/tests/system/rpz/ns6/named.conf.j2 +++ b/bin/tests/system/rpz/ns6/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; session-keyfile "session.key"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; allow-transfer { any; }; forward only; forwarders { 10.53.0.3; }; diff --git a/bin/tests/system/rpz/ns7/named.conf.j2 b/bin/tests/system/rpz/ns7/named.conf.j2 index 0af33eb5764..76fc0ed6445 100644 --- a/bin/tests/system/rpz/ns7/named.conf.j2 +++ b/bin/tests/system/rpz/ns7/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; session-keyfile "session.key"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; allow-transfer { any; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2 index 832ddba12ca..2afbb0adb83 100644 --- a/bin/tests/system/rpz/ns8/named.conf.j2 +++ b/bin/tests/system/rpz/ns8/named.conf.j2 @@ -3,15 +3,9 @@ */ options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; session-keyfile "session.key"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; allow-transfer { any; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/rpz/ns9/named.conf.j2 b/bin/tests/system/rpz/ns9/named.conf.j2 index ffa402bb387..290c5cd985a 100644 --- a/bin/tests/system/rpz/ns9/named.conf.j2 +++ b/bin/tests/system/rpz/ns9/named.conf.j2 @@ -3,15 +3,9 @@ */ options { - query-source address 10.53.0.9; - notify-source 10.53.0.9; - transfer-source 10.53.0.9; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} statistics-file "named.stats"; session-keyfile "session.key"; - listen-on { 10.53.0.9; }; - listen-on-v6 { none; }; allow-transfer { any; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/rpzextra/ns2/named.conf.j2 b/bin/tests/system/rpzextra/ns2/named.conf.j2 index f7ba0ec6183..4865db67025 100644 --- a/bin/tests/system/rpzextra/ns2/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; allow-query { any; }; diff --git a/bin/tests/system/rpzextra/ns3/named.conf.j2 b/bin/tests/system/rpzextra/ns3/named.conf.j2 index 7c240c8c27e..c29ac72b6a8 100644 --- a/bin/tests/system/rpzextra/ns3/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; allow-query { any; }; diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.j2 b/bin/tests/system/rpzrecurse/ns1/named.conf.j2 index c839fe4f97e..c2209814c03 100644 --- a/bin/tests/system/rpzrecurse/ns1/named.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns1/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; querylog yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 index 7fa20f4c95c..d19591e305b 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 +++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; dnssec-validation no; querylog yes; }; diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 index 9a100c8b069..da5e8b2748c 100644 --- a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 @@ -1,14 +1,8 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; dnssec-validation no; response-policy { zone "policy"; } qname-wait-recurse yes diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 index 6259bb72c5f..d2319a6e175 100644 --- a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; response-policy { zone "policy"; } nsip-wait-recurse no diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 index 8a5362c3698..6b7386ca3c1 100644 --- a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; response-policy { zone "policy"; } nsip-wait-recurse no diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.j2 b/bin/tests/system/rpzrecurse/ns4/named.conf.j2 index 611e07d5407..7ff18a7edf3 100644 --- a/bin/tests/system/rpzrecurse/ns4/named.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns4/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/rrl/ns1/named.conf.j2 b/bin/tests/system/rrl/ns1/named.conf.j2 index 31c2dbdfa95..cadd63e8428 100644 --- a/bin/tests/system/rrl/ns1/named.conf.j2 +++ b/bin/tests/system/rrl/ns1/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; notify no; dnssec-validation no; }; diff --git a/bin/tests/system/rrl/ns2/named.conf.j2 b/bin/tests/system/rrl/ns2/named.conf.j2 index c0908276480..07514eb48f6 100644 --- a/bin/tests/system/rrl/ns2/named.conf.j2 +++ b/bin/tests/system/rrl/ns2/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; statistics-file "named.stats"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; notify no; dnssec-validation no; diff --git a/bin/tests/system/rrl/ns3/named.conf.j2 b/bin/tests/system/rrl/ns3/named.conf.j2 index 83406aa02c4..d9dfd9a9702 100644 --- a/bin/tests/system/rrl/ns3/named.conf.j2 +++ b/bin/tests/system/rrl/ns3/named.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; notify no; dnssec-validation no; diff --git a/bin/tests/system/rrl/ns4/named.conf.j2 b/bin/tests/system/rrl/ns4/named.conf.j2 index 5b50e9b9ea1..d079744e8e6 100644 --- a/bin/tests/system/rrl/ns4/named.conf.j2 +++ b/bin/tests/system/rrl/ns4/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} session-keyfile "session.key"; - pid-file "named.pid"; statistics-file "named.stats"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; notify no; dnssec-validation no; max-udp-size 4096; diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.j2 b/bin/tests/system/rrsetorder/ns1/named.conf.j2 index f200b44eeb7..a40ea857f4a 100644 --- a/bin/tests/system/rrsetorder/ns1/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.j2 b/bin/tests/system/rrsetorder/ns2/named.conf.j2 index 547cc74b777..0798861dd49 100644 --- a/bin/tests/system/rrsetorder/ns2/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; rrset-order { diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2 index 2cd32dcff7b..e1053301918 100644 --- a/bin/tests/system/rrsetorder/ns3/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; rrset-order { name "random.example" order random; diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2 index ba6aec78d96..636fbed1564 100644 --- a/bin/tests/system/rrsetorder/ns4/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; rrset-order { class IN type A name "host.example.com" order random; diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.j2 b/bin/tests/system/rrsetorder/ns5/named.conf.j2 index 1a20346ff86..1aff3cc7022 100644 --- a/bin/tests/system/rrsetorder/ns5/named.conf.j2 +++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/rrsig/ns1/named.conf.j2 b/bin/tests/system/rrsig/ns1/named.conf.j2 index 8e467c3ff19..2c5f8bd720a 100644 --- a/bin/tests/system/rrsig/ns1/named.conf.j2 +++ b/bin/tests/system/rrsig/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - transfer-source 10.53.0.1; - notify-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; notify explicit; diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.j2 b/bin/tests/system/rsabigexponent/ns1/named.conf.j2 index 574e74486e3..e210bdddb33 100644 --- a/bin/tests/system/rsabigexponent/ns1/named.conf.j2 +++ b/bin/tests/system/rsabigexponent/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 b/bin/tests/system/rsabigexponent/ns2/named.conf.j2 index a277ea34fe5..92abbc1c29e 100644 --- a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 +++ b/bin/tests/system/rsabigexponent/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/runtime/ns2/named2.conf.j2 b/bin/tests/system/runtime/ns2/named2.conf.j2 index 69e168afbec..9cf0971fb4c 100644 --- a/bin/tests/system/runtime/ns2/named2.conf.j2 +++ b/bin/tests/system/runtime/ns2/named2.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; + {% include_indented "_common/options.conf.j2" %} directory "./nope"; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/runtime/ns2/named3.conf.j2 b/bin/tests/system/runtime/ns2/named3.conf.j2 index ddc374b3d4e..11e5fc4ea56 100644 --- a/bin/tests/system/runtime/ns2/named3.conf.j2 +++ b/bin/tests/system/runtime/ns2/named3.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; + {% include_indented "_common/options.conf.j2" %} managed-keys-directory "./nope"; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/runtime/ns2/named4.conf.j2 b/bin/tests/system/runtime/ns2/named4.conf.j2 index b768f62d526..36822fbdcc8 100644 --- a/bin/tests/system/runtime/ns2/named4.conf.j2 +++ b/bin/tests/system/runtime/ns2/named4.conf.j2 @@ -1,12 +1,6 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; + {% include_indented "_common/options.conf.j2" %} new-zones-directory "./nope"; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/selfpointedglue/ns1/named.conf.j2 b/bin/tests/system/selfpointedglue/ns1/named.conf.j2 index a14fedbb4e7..3175cc6c78f 100644 --- a/bin/tests/system/selfpointedglue/ns1/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns1/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/selfpointedglue/ns2/named.conf.j2 b/bin/tests/system/selfpointedglue/ns2/named.conf.j2 index 3ee7077ea07..a2b6b286732 100644 --- a/bin/tests/system/selfpointedglue/ns2/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns2/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 index 306425dd685..b1e285930c0 100644 --- a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 @@ -13,13 +13,7 @@ {% set maxdelegationservers = maxdelegationservers | default(None) %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/serve_stale/ns1/named.conf.j2 b/bin/tests/system/serve_stale/ns1/named.conf.j2 index 2463cb7b6da..cc6317f0e44 100644 --- a/bin/tests/system/serve_stale/ns1/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns1/named.conf.j2 @@ -6,13 +6,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; max-stale-ttl @max_stale_ttl@; diff --git a/bin/tests/system/serve_stale/ns3/named.conf.j2 b/bin/tests/system/serve_stale/ns3/named.conf.j2 index 43a3eb60c71..dcd17ea87f7 100644 --- a/bin/tests/system/serve_stale/ns3/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; qname-minimization off; prefetch 0; diff --git a/bin/tests/system/serve_stale/ns3/named1.conf.j2 b/bin/tests/system/serve_stale/ns3/named1.conf.j2 index c39143bc2a3..81f7e0b998f 100644 --- a/bin/tests/system/serve_stale/ns3/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named1.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dump-file "named_dump3.db"; stale-cache-enable yes; dnssec-validation no; diff --git a/bin/tests/system/serve_stale/ns3/named2.conf.j2 b/bin/tests/system/serve_stale/ns3/named2.conf.j2 index f882eb106da..be056e786b6 100644 --- a/bin/tests/system/serve_stale/ns3/named2.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named2.conf.j2 @@ -5,13 +5,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named3.conf.j2 b/bin/tests/system/serve_stale/ns3/named3.conf.j2 index 7552593551a..04d13ec4fbe 100644 --- a/bin/tests/system/serve_stale/ns3/named3.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named3.conf.j2 @@ -5,13 +5,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named4.conf.j2 b/bin/tests/system/serve_stale/ns3/named4.conf.j2 index f42792dbfc6..72e34a01b06 100644 --- a/bin/tests/system/serve_stale/ns3/named4.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named4.conf.j2 @@ -5,13 +5,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named5.conf.j2 b/bin/tests/system/serve_stale/ns3/named5.conf.j2 index 8f1d8673dc5..df42711d83b 100644 --- a/bin/tests/system/serve_stale/ns3/named5.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named5.conf.j2 @@ -5,13 +5,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named6.conf.j2 b/bin/tests/system/serve_stale/ns3/named6.conf.j2 index 16285995d5b..494ad2fb30f 100644 --- a/bin/tests/system/serve_stale/ns3/named6.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named6.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable no; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named7.conf.j2 b/bin/tests/system/serve_stale/ns3/named7.conf.j2 index b39bcc6e2e2..edfa2a4e236 100644 --- a/bin/tests/system/serve_stale/ns3/named7.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named7.conf.j2 @@ -5,13 +5,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; /* * stale-answer-enable is not strictly required because serving diff --git a/bin/tests/system/serve_stale/ns3/named8.conf.j2 b/bin/tests/system/serve_stale/ns3/named8.conf.j2 index 4e5b6b79b21..457a6f75377 100644 --- a/bin/tests/system/serve_stale/ns3/named8.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named8.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns3/named9.conf.j2 b/bin/tests/system/serve_stale/ns3/named9.conf.j2 index 05bab5cf6cf..78b4b15122f 100644 --- a/bin/tests/system/serve_stale/ns3/named9.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named9.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; stale-answer-enable yes; stale-cache-enable yes; diff --git a/bin/tests/system/serve_stale/ns4/named.conf.j2 b/bin/tests/system/serve_stale/ns4/named.conf.j2 index f0be8fd6b86..fff360c22fd 100644 --- a/bin/tests/system/serve_stale/ns4/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns4/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dump-file "named_dump.db"; stale-answer-enable no; diff --git a/bin/tests/system/serve_stale/ns5/named.conf.j2 b/bin/tests/system/serve_stale/ns5/named.conf.j2 index 953e8d6382d..40c5e1b95fe 100644 --- a/bin/tests/system/serve_stale/ns5/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns5/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dump-file "named_dump.db"; stale-answer-enable yes; diff --git a/bin/tests/system/serve_stale/ns6/named.conf.j2 b/bin/tests/system/serve_stale/ns6/named.conf.j2 index dd38d18d14f..896637f508e 100644 --- a/bin/tests/system/serve_stale/ns6/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns6/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/serve_stale/ns7/named.conf.j2 b/bin/tests/system/serve_stale/ns7/named.conf.j2 index a5fdbff336e..91963d341e2 100644 --- a/bin/tests/system/serve_stale/ns7/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/serve_stale/ns7/named1.conf.j2 b/bin/tests/system/serve_stale/ns7/named1.conf.j2 index 96cd2fec205..9136510534f 100644 --- a/bin/tests/system/serve_stale/ns7/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named1.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 index d3ad87ac46e..18fc3482f88 100644 --- a/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 +++ b/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 @@ -14,14 +14,8 @@ {% include "_common/controls.conf.j2" %} options { - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; recursion no; dnssec-validation no; diff --git a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 index c616e9b035d..5a0b7a8e638 100644 --- a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 +++ b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 @@ -14,14 +14,8 @@ {% include "_common/controls.conf.j2" %} options { - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; dnssec-validation no; qname-minimization off; diff --git a/bin/tests/system/sfcache/ns1/named.conf.j2 b/bin/tests/system/sfcache/ns1/named.conf.j2 index 574e74486e3..e210bdddb33 100644 --- a/bin/tests/system/sfcache/ns1/named.conf.j2 +++ b/bin/tests/system/sfcache/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/sfcache/ns2/named.conf.j2 b/bin/tests/system/sfcache/ns2/named.conf.j2 index 981015fa8fa..e24808b1fac 100644 --- a/bin/tests/system/sfcache/ns2/named.conf.j2 +++ b/bin/tests/system/sfcache/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/sfcache/ns5/named.conf.j2 b/bin/tests/system/sfcache/ns5/named.conf.j2 index 470266661a7..96b98f138a8 100644 --- a/bin/tests/system/sfcache/ns5/named.conf.j2 +++ b/bin/tests/system/sfcache/ns5/named.conf.j2 @@ -3,13 +3,7 @@ {% set servfail_ttl = servfail_ttl | default(30) %} options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; servfail-ttl @servfail_ttl@; }; diff --git a/bin/tests/system/sfcache_cname/ns1/named.conf.j2 b/bin/tests/system/sfcache_cname/ns1/named.conf.j2 index 88617a89c69..a1bf2d087e0 100644 --- a/bin/tests/system/sfcache_cname/ns1/named.conf.j2 +++ b/bin/tests/system/sfcache_cname/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address @ns.ip@; - notify-source @ns.ip@; - transfer-source @ns.ip@; - port @PORT@; - pid-file "named.pid"; - listen-on { @ns.ip@; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/sfcache_cname/ns2/named.conf.j2 b/bin/tests/system/sfcache_cname/ns2/named.conf.j2 index 72e239c2ec5..787472cf806 100644 --- a/bin/tests/system/sfcache_cname/ns2/named.conf.j2 +++ b/bin/tests/system/sfcache_cname/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - query-source address @ns.ip@; - port @PORT@; - pid-file "named.pid"; - listen-on { @ns.ip@; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; qname-minimization off; servfail-ttl 5; diff --git a/bin/tests/system/showconf/ns1/named.conf.j2 b/bin/tests/system/showconf/ns1/named.conf.j2 index 0ff6b9658d9..a21e0861abc 100644 --- a/bin/tests/system/showconf/ns1/named.conf.j2 +++ b/bin/tests/system/showconf/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/shutdown/ns1/named.conf.j2 b/bin/tests/system/shutdown/ns1/named.conf.j2 index 456c8d91002..2fcde778c8d 100644 --- a/bin/tests/system/shutdown/ns1/named.conf.j2 +++ b/bin/tests/system/shutdown/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; allow-query { any; }; diff --git a/bin/tests/system/shutdown/ns2/named.conf.j2 b/bin/tests/system/shutdown/ns2/named.conf.j2 index dcc6824fe34..2380f02228a 100644 --- a/bin/tests/system/shutdown/ns2/named.conf.j2 +++ b/bin/tests/system/shutdown/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; allow-query { any; }; diff --git a/bin/tests/system/sig0/ns1/named.conf.j2 b/bin/tests/system/sig0/ns1/named.conf.j2 index 5a140786972..dad31fe3122 100644 --- a/bin/tests/system/sig0/ns1/named.conf.j2 +++ b/bin/tests/system/sig0/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; notify no; }; diff --git a/bin/tests/system/spf/ns1/named.conf.j2 b/bin/tests/system/spf/ns1/named.conf.j2 index ce17ddc43bb..42123aa7f84 100644 --- a/bin/tests/system/spf/ns1/named.conf.j2 +++ b/bin/tests/system/spf/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; ixfr-from-differences yes; diff --git a/bin/tests/system/srtt/ns1/named.conf.j2 b/bin/tests/system/srtt/ns1/named.conf.j2 index 0135d55f12b..9347c636084 100644 --- a/bin/tests/system/srtt/ns1/named.conf.j2 +++ b/bin/tests/system/srtt/ns1/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/srtt/ns6/named.conf.j2 b/bin/tests/system/srtt/ns6/named.conf.j2 index b982f371196..cd4b2b8f6ee 100644 --- a/bin/tests/system/srtt/ns6/named.conf.j2 +++ b/bin/tests/system/srtt/ns6/named.conf.j2 @@ -13,13 +13,7 @@ options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; dnstap { resolver query; }; dnstap-output file "dnstap.out"; diff --git a/bin/tests/system/ssumaxtype/ns1/named.conf.j2 b/bin/tests/system/ssumaxtype/ns1/named.conf.j2 index dc3e5351fb0..6572d69accf 100644 --- a/bin/tests/system/ssumaxtype/ns1/named.conf.j2 +++ b/bin/tests/system/ssumaxtype/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/ssutoctou/ns1/named.conf.j2 b/bin/tests/system/ssutoctou/ns1/named.conf.j2 index 5a517773934..cf78e753a58 100644 --- a/bin/tests/system/ssutoctou/ns1/named.conf.j2 +++ b/bin/tests/system/ssutoctou/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% set use_ssu = use_ssu | default(False) %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/staticstub/ns1/named.conf.j2 b/bin/tests/system/staticstub/ns1/named.conf.j2 index 2e1d7efe6ec..35dde54bebf 100644 --- a/bin/tests/system/staticstub/ns1/named.conf.j2 +++ b/bin/tests/system/staticstub/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - query-source address 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/staticstub/ns2/named.conf.j2 b/bin/tests/system/staticstub/ns2/named.conf.j2 index 514643255af..2d0386db044 100644 --- a/bin/tests/system/staticstub/ns2/named.conf.j2 +++ b/bin/tests/system/staticstub/ns2/named.conf.j2 @@ -5,13 +5,7 @@ include "trusted.conf"; options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; notify no; minimal-responses no; diff --git a/bin/tests/system/staticstub/ns3/named.conf.j2 b/bin/tests/system/staticstub/ns3/named.conf.j2 index 4c29d128329..2e0046835c0 100644 --- a/bin/tests/system/staticstub/ns3/named.conf.j2 +++ b/bin/tests/system/staticstub/ns3/named.conf.j2 @@ -3,13 +3,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/statistics/ns1/named.conf.j2 b/bin/tests/system/statistics/ns1/named.conf.j2 index 942028944ba..3e644464252 100644 --- a/bin/tests/system/statistics/ns1/named.conf.j2 +++ b/bin/tests/system/statistics/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2 index 9cebe68a5c1..3149b99d66f 100644 --- a/bin/tests/system/statistics/ns2/named1.conf.j2 +++ b/bin/tests/system/statistics/ns2/named1.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2 index 6056a1040ca..6acaab8f34a 100644 --- a/bin/tests/system/statistics/ns2/named2.conf.j2 +++ b/bin/tests/system/statistics/ns2/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2 index 219ef08b578..92ea60e2159 100644 --- a/bin/tests/system/statistics/ns3/named.conf.j2 +++ b/bin/tests/system/statistics/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; qname-minimization disabled; zone-statistics yes; diff --git a/bin/tests/system/statschannel/ns2/named.conf.j2 b/bin/tests/system/statschannel/ns2/named.conf.j2 index 6bc3bd60c16..dd0eaf7856d 100644 --- a/bin/tests/system/statschannel/ns2/named.conf.j2 +++ b/bin/tests/system/statschannel/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/statschannel/ns2/named2.conf.j2 b/bin/tests/system/statschannel/ns2/named2.conf.j2 index 33265ea77fa..864c9d00bac 100644 --- a/bin/tests/system/statschannel/ns2/named2.conf.j2 +++ b/bin/tests/system/statschannel/ns2/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/statschannel/ns4/named.conf.j2 b/bin/tests/system/statschannel/ns4/named.conf.j2 index ffc8d8ddfe9..e96b1aa90b1 100644 --- a/bin/tests/system/statschannel/ns4/named.conf.j2 +++ b/bin/tests/system/statschannel/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; notify no; minimal-responses no; diff --git a/bin/tests/system/stress/ns2/named.conf.j2 b/bin/tests/system/stress/ns2/named.conf.j2 index 6f11045dc6e..95fa103ce32 100644 --- a/bin/tests/system/stress/ns2/named.conf.j2 +++ b/bin/tests/system/stress/ns2/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/stress/ns3/named.conf.j2 b/bin/tests/system/stress/ns3/named.conf.j2 index e0e376c828c..06a8acec8b4 100644 --- a/bin/tests/system/stress/ns3/named.conf.j2 +++ b/bin/tests/system/stress/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/stress/ns4/named.conf.j2 b/bin/tests/system/stress/ns4/named.conf.j2 index 0b06812e39a..62db6c1f779 100644 --- a/bin/tests/system/stress/ns4/named.conf.j2 +++ b/bin/tests/system/stress/ns4/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/stub/ns1/named.conf.j2 b/bin/tests/system/stub/ns1/named.conf.j2 index d59f79bfbe7..3cbcc7b21d6 100644 --- a/bin/tests/system/stub/ns1/named.conf.j2 +++ b/bin/tests/system/stub/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/stub/ns2/named.conf.j2 b/bin/tests/system/stub/ns2/named.conf.j2 index 376ec060035..2b5999e2284 100644 --- a/bin/tests/system/stub/ns2/named.conf.j2 +++ b/bin/tests/system/stub/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2 index e42b318b779..74274d67c74 100644 --- a/bin/tests/system/stub/ns3/named.conf.j2 +++ b/bin/tests/system/stub/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; minimal-responses no; }; diff --git a/bin/tests/system/stub/ns4/named.conf.j2 b/bin/tests/system/stub/ns4/named.conf.j2 index 181e678a729..e66e5d3303a 100644 --- a/bin/tests/system/stub/ns4/named.conf.j2 +++ b/bin/tests/system/stub/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; minimal-responses yes; dnssec-validation no; diff --git a/bin/tests/system/stub/ns5/named.conf.j2 b/bin/tests/system/stub/ns5/named.conf.j2 index d6ca0448246..aeea20d7eea 100644 --- a/bin/tests/system/stub/ns5/named.conf.j2 +++ b/bin/tests/system/stub/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 index 24c1ce2d58c..7abd7a4fa38 100644 --- a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation yes; }; diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 index a53ab224011..88d94fc25c3 100644 --- a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation yes; }; diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 index 166ee135554..1996f3b1caf 100644 --- a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 @@ -1,13 +1,7 @@ // NS3 options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation yes; }; diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 index dbef1981f30..4aacdb68b3d 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 @@ -1,13 +1,7 @@ // NS4 options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation yes; synth-from-dnssec no; diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 index 866d9bb1747..df286572019 100644 --- a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 @@ -1,13 +1,7 @@ // NS5 options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation yes; synth-from-dnssec yes; diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 index b0b97f48825..b6a427cfff6 100644 --- a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 @@ -1,13 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} notify no; dnssec-validation no; synth-from-dnssec yes; diff --git a/bin/tests/system/tcp/ns1/named.conf.j2 b/bin/tests/system/tcp/ns1/named.conf.j2 index 021594d3f46..1972bffc77d 100644 --- a/bin/tests/system/tcp/ns1/named.conf.j2 +++ b/bin/tests/system/tcp/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; statistics-file "named.stats"; diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2 index 32853c23a2c..b9f21db3e55 100644 --- a/bin/tests/system/tcp/ns2/named.conf.j2 +++ b/bin/tests/system/tcp/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; statistics-file "named.stats"; }; diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2 index 08f83dede01..5c6b735e1c7 100644 --- a/bin/tests/system/tcp/ns3/named.conf.j2 +++ b/bin/tests/system/tcp/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2 index 1ed7f483685..953e1c928c5 100644 --- a/bin/tests/system/tcp/ns4/named.conf.j2 +++ b/bin/tests/system/tcp/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; forwarders { 10.53.0.2; }; forward only; diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2 index c8f8e0553bc..e4568b7403e 100644 --- a/bin/tests/system/tcp/ns5/named.conf.j2 +++ b/bin/tests/system/tcp/ns5/named.conf.j2 @@ -4,13 +4,7 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} tcp-listen-queue 32; tcp-clients 17; dnssec-validation no; diff --git a/bin/tests/system/tcp/ns7/named.conf.j2 b/bin/tests/system/tcp/ns7/named.conf.j2 index f8feba57604..48cc3063a8d 100644 --- a/bin/tests/system/tcp/ns7/named.conf.j2 +++ b/bin/tests/system/tcp/ns7/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; statistics-file "named.stats"; diff --git a/bin/tests/system/timeouts/ns1/named.conf.j2 b/bin/tests/system/timeouts/ns1/named.conf.j2 index bca9e0a3804..1a7114f525d 100644 --- a/bin/tests/system/timeouts/ns1/named.conf.j2 +++ b/bin/tests/system/timeouts/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; recursion no; diff --git a/bin/tests/system/tkey/ns1/named.conf.j2 b/bin/tests/system/tkey/ns1/named.conf.j2 index fed3f3c7973..669acf5387e 100644 --- a/bin/tests/system/tkey/ns1/named.conf.j2 +++ b/bin/tests/system/tkey/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/tkeyleak/ns1/named.conf.j2 b/bin/tests/system/tkeyleak/ns1/named.conf.j2 index b7bb534f59a..edc51b1ab06 100644 --- a/bin/tests/system/tkeyleak/ns1/named.conf.j2 +++ b/bin/tests/system/tkeyleak/ns1/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; tkey-gssapi-keytab "dns.keytab"; diff --git a/bin/tests/system/transport_acl/ns1/named.conf.j2 b/bin/tests/system/transport_acl/ns1/named.conf.j2 index ffc083e2c89..c0c3617d64a 100644 --- a/bin/tests/system/transport_acl/ns1/named.conf.j2 +++ b/bin/tests/system/transport_acl/ns1/named.conf.j2 @@ -6,14 +6,9 @@ tls self-signed { }; options { - port @PORT@; - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} ## # generic test - listen-on { 10.53.0.1; }; listen-on port @TLSPORT@ tls self-signed { 10.53.0.1; }; # test #1 listen-on port @EXTRAPORT1@ { 10.53.0.1; }; @@ -47,7 +42,6 @@ options { # test #8 listen-on port @EXTRAPORT8@ { 10.53.0.1; }; ## - listen-on-v6 { none; }; recursion no; notify explicit; statistics-file "named.stats"; diff --git a/bin/tests/system/tsig/ns1/named.conf.j2 b/bin/tests/system/tsig/ns1/named.conf.j2 index f4eb6a0a617..c785f183aba 100644 --- a/bin/tests/system/tsig/ns1/named.conf.j2 +++ b/bin/tests/system/tsig/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; notify no; }; diff --git a/bin/tests/system/ttl/ns1/named.conf.j2 b/bin/tests/system/ttl/ns1/named.conf.j2 index 597e99ce376..7c498878e00 100644 --- a/bin/tests/system/ttl/ns1/named.conf.j2 +++ b/bin/tests/system/ttl/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; check-integrity no; diff --git a/bin/tests/system/ttl/ns2/named.conf.j2 b/bin/tests/system/ttl/ns2/named.conf.j2 index b6874ac16b6..cb6031f9aa2 100644 --- a/bin/tests/system/ttl/ns2/named.conf.j2 +++ b/bin/tests/system/ttl/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} servfail-ttl 0; max-recursion-depth 12; dnssec-validation no; diff --git a/bin/tests/system/unknown/ns1/named.conf.j2 b/bin/tests/system/unknown/ns1/named.conf.j2 index 8b2f73ec0a9..dcdae6f3ccb 100644 --- a/bin/tests/system/unknown/ns1/named.conf.j2 +++ b/bin/tests/system/unknown/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/unknown/ns2/named.conf.j2 b/bin/tests/system/unknown/ns2/named.conf.j2 index 332fc6e2c6e..f1591476e65 100644 --- a/bin/tests/system/unknown/ns2/named.conf.j2 +++ b/bin/tests/system/unknown/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/unknown/ns3/named.conf.j2 b/bin/tests/system/unknown/ns3/named.conf.j2 index 3900e932c0c..b230cad7090 100644 --- a/bin/tests/system/unknown/ns3/named.conf.j2 +++ b/bin/tests/system/unknown/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; notify no; diff --git a/bin/tests/system/upforwd/ns1/named.conf.j2 b/bin/tests/system/upforwd/ns1/named.conf.j2 index 349dcfac1b6..ea409efdead 100644 --- a/bin/tests/system/upforwd/ns1/named.conf.j2 +++ b/bin/tests/system/upforwd/ns1/named.conf.j2 @@ -4,15 +4,9 @@ key "update.example." { }; options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; listen-on tls ephemeral { 10.53.0.1; }; - listen-on-v6 { none; }; allow-transfer { any; }; dnssec-validation no; }; diff --git a/bin/tests/system/upforwd/ns2/named.conf.j2 b/bin/tests/system/upforwd/ns2/named.conf.j2 index 12dc9e44ab6..db008683da8 100644 --- a/bin/tests/system/upforwd/ns2/named.conf.j2 +++ b/bin/tests/system/upforwd/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; }; diff --git a/bin/tests/system/upforwd/ns3/named.conf.j2 b/bin/tests/system/upforwd/ns3/named.conf.j2 index be60b296811..f76991ec868 100644 --- a/bin/tests/system/upforwd/ns3/named.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; listen-on tls ephemeral { 10.53.0.3; }; - listen-on-v6 { none; }; allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/upforwd/ns3/named2.conf.j2 b/bin/tests/system/upforwd/ns3/named2.conf.j2 index 6b3855ddad2..8d76b1552b4 100644 --- a/bin/tests/system/upforwd/ns3/named2.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named2.conf.j2 @@ -1,13 +1,7 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; + {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; listen-on tls ephemeral { 10.53.0.3; }; - listen-on-v6 { none; }; allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/views/ns1/named.conf.j2 b/bin/tests/system/views/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/views/ns1/named.conf.j2 +++ b/bin/tests/system/views/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2 index 3c6faccb363..bbe5e1ec9d4 100644 --- a/bin/tests/system/views/ns2/named.conf.j2 +++ b/bin/tests/system/views/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; }; diff --git a/bin/tests/system/views/ns2/named3.conf.j2 b/bin/tests/system/views/ns2/named3.conf.j2 index ae11b67c4a2..4810be0be8c 100644 --- a/bin/tests/system/views/ns2/named3.conf.j2 +++ b/bin/tests/system/views/ns2/named3.conf.j2 @@ -1,13 +1,7 @@ {% set zone_names = zone_names | default([]) %} options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2 index 4bf48a9105f..ae705222bbe 100644 --- a/bin/tests/system/views/ns3/named.conf.j2 +++ b/bin/tests/system/views/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2 index 88610b1cbf1..6bd2e088965 100644 --- a/bin/tests/system/views/ns3/named2.conf.j2 +++ b/bin/tests/system/views/ns3/named2.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2 index 81b168be31b..dbdd18f6854 100644 --- a/bin/tests/system/views/ns5/named.conf.j2 +++ b/bin/tests/system/views/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/wildcard/ns1/named.conf.j2 b/bin/tests/system/wildcard/ns1/named.conf.j2 index 670dd2d33d8..9d6dc0e924d 100644 --- a/bin/tests/system/wildcard/ns1/named.conf.j2 +++ b/bin/tests/system/wildcard/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2 index fc73e53a4f0..1aff3cc7022 100644 --- a/bin/tests/system/wildcard/ns2/named.conf.j2 +++ b/bin/tests/system/wildcard/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2 index db90e4f2886..423cf682a73 100644 --- a/bin/tests/system/wildcard/ns3/named.conf.j2 +++ b/bin/tests/system/wildcard/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/wildcard/ns4/named.conf.j2 b/bin/tests/system/wildcard/ns4/named.conf.j2 index 4529f724a0a..fd32098dce2 100644 --- a/bin/tests/system/wildcard/ns4/named.conf.j2 +++ b/bin/tests/system/wildcard/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; forward only; forwarders { 10.53.0.2; }; diff --git a/bin/tests/system/wildcard/ns5/named.conf.j2 b/bin/tests/system/wildcard/ns5/named.conf.j2 index a76c19def50..423cf682a73 100644 --- a/bin/tests/system/wildcard/ns5/named.conf.j2 +++ b/bin/tests/system/wildcard/ns5/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.5; - notify-source 10.53.0.5; - transfer-source 10.53.0.5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation yes; }; diff --git a/bin/tests/system/xfer/ns1/named.conf.j2 b/bin/tests/system/xfer/ns1/named.conf.j2 index 5df9978025d..60c7a30f922 100644 --- a/bin/tests/system/xfer/ns1/named.conf.j2 +++ b/bin/tests/system/xfer/ns1/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns1/named2.conf.j2 b/bin/tests/system/xfer/ns1/named2.conf.j2 index 888c0620439..5295655db91 100644 --- a/bin/tests/system/xfer/ns1/named2.conf.j2 +++ b/bin/tests/system/xfer/ns1/named2.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns1/named3.conf.j2 b/bin/tests/system/xfer/ns1/named3.conf.j2 index ca395804d2b..6d04e016e4a 100644 --- a/bin/tests/system/xfer/ns1/named3.conf.j2 +++ b/bin/tests/system/xfer/ns1/named3.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2 index f412a434f3d..791f826e9fa 100644 --- a/bin/tests/system/xfer/ns2/named.conf.j2 +++ b/bin/tests/system/xfer/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2 index 25dbbc490e1..8052a927418 100644 --- a/bin/tests/system/xfer/ns3/named.conf.j2 +++ b/bin/tests/system/xfer/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; dnssec-validation no; }; diff --git a/bin/tests/system/xfer/ns4/named.conf.j2 b/bin/tests/system/xfer/ns4/named.conf.j2 index be399c6a722..e82e0e528f4 100644 --- a/bin/tests/system/xfer/ns4/named.conf.j2 +++ b/bin/tests/system/xfer/ns4/named.conf.j2 @@ -1,12 +1,6 @@ {% set ns4_as_secondary_for_nil = ns4_as_secondary_for_nil | default(False) %} options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns6/named.conf.j2 b/bin/tests/system/xfer/ns6/named.conf.j2 index a28170bc179..9d6c31947b5 100644 --- a/bin/tests/system/xfer/ns6/named.conf.j2 +++ b/bin/tests/system/xfer/ns6/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns7/named.conf.j2 b/bin/tests/system/xfer/ns7/named.conf.j2 index 9b25c7cdbeb..0b677a7e574 100644 --- a/bin/tests/system/xfer/ns7/named.conf.j2 +++ b/bin/tests/system/xfer/ns7/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.7; - notify-source 10.53.0.7; - transfer-source 10.53.0.7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer/ns8/named.conf.j2 b/bin/tests/system/xfer/ns8/named.conf.j2 index 3c020ef14a1..37707b36eb4 100644 --- a/bin/tests/system/xfer/ns8/named.conf.j2 +++ b/bin/tests/system/xfer/ns8/named.conf.j2 @@ -1,13 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.8; - notify-source 10.53.0.8; - transfer-source 10.53.0.8; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.8; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 index 0da1e0de29b..364cb1aca7c 100644 --- a/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - port @PORT@; - query-source address 10.53.0.2; - notify-source 10.53.0.2; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; - transfer-source 10.53.0.2; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 index 6d9cfee088d..b186fdb5063 100644 --- a/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - port @PORT@; - query-source address 10.53.0.3; - notify-source 10.53.0.3; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; - transfer-source 10.53.0.3; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 index 08fe9a2d09a..62c39c25e70 100644 --- a/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - port @PORT@; - query-source address 10.53.0.4; - notify-source 10.53.0.4; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; - transfer-source 10.53.0.4; - pid-file "named.pid"; + {% include_indented "_common/options.conf.j2" %} recursion no; }; diff --git a/bin/tests/system/xferquota/ns1/named.conf.j2 b/bin/tests/system/xferquota/ns1/named.conf.j2 index 09abe253262..8877d9c0d30 100644 --- a/bin/tests/system/xferquota/ns1/named.conf.j2 +++ b/bin/tests/system/xferquota/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xferquota/ns2/named.conf.j2 b/bin/tests/system/xferquota/ns2/named.conf.j2 index 66edc6a4d7a..62e3f4f88ca 100644 --- a/bin/tests/system/xferquota/ns2/named.conf.j2 +++ b/bin/tests/system/xferquota/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/xferquota/ns3/named.conf.j2 b/bin/tests/system/xferquota/ns3/named.conf.j2 index c882985899a..c86417e2278 100644 --- a/bin/tests/system/xferquota/ns3/named.conf.j2 +++ b/bin/tests/system/xferquota/ns3/named.conf.j2 @@ -12,13 +12,7 @@ */ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; diff --git a/bin/tests/system/zero/ns1/named.conf.j2 b/bin/tests/system/zero/ns1/named.conf.j2 index 0cc901254d0..2bb3e5abae9 100644 --- a/bin/tests/system/zero/ns1/named.conf.j2 +++ b/bin/tests/system/zero/ns1/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/zero/ns2/named.conf.j2 b/bin/tests/system/zero/ns2/named.conf.j2 index 0aea6abe351..b7176a341c5 100644 --- a/bin/tests/system/zero/ns2/named.conf.j2 +++ b/bin/tests/system/zero/ns2/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; allow-transfer { any; }; diff --git a/bin/tests/system/zero/ns3/named.conf.j2 b/bin/tests/system/zero/ns3/named.conf.j2 index b38f2157e82..545a7eab8e0 100644 --- a/bin/tests/system/zero/ns3/named.conf.j2 +++ b/bin/tests/system/zero/ns3/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} dnssec-validation no; servfail-ttl 0; }; diff --git a/bin/tests/system/zero/ns4/named.conf.j2 b/bin/tests/system/zero/ns4/named.conf.j2 index e1f32a8b962..a6d5b3a9186 100644 --- a/bin/tests/system/zero/ns4/named.conf.j2 +++ b/bin/tests/system/zero/ns4/named.conf.j2 @@ -1,11 +1,5 @@ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/zonechecks/ns1/named.conf.j2 b/bin/tests/system/zonechecks/ns1/named.conf.j2 index 209d3cbcd3a..e18e8d2780e 100644 --- a/bin/tests/system/zonechecks/ns1/named.conf.j2 +++ b/bin/tests/system/zonechecks/ns1/named.conf.j2 @@ -1,13 +1,7 @@ // NS1 options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/zonechecks/ns2/named.conf.j2 b/bin/tests/system/zonechecks/ns2/named.conf.j2 index 12395ba34ce..73b44ca196c 100644 --- a/bin/tests/system/zonechecks/ns2/named.conf.j2 +++ b/bin/tests/system/zonechecks/ns2/named.conf.j2 @@ -1,13 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { none; }; + {% include_indented "_common/options.conf.j2" %} recursion no; dnssec-validation no; };