From: Nicki Křížek Date: Thu, 23 Jul 2026 16:51:20 +0000 (+0000) Subject: Use the dual-stack options template where instances listen on IPv6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79e5277500b1526d8f200189df4e84f103d83d06;p=thirdparty%2Fbind9.git Use the dual-stack options template where instances listen on IPv6 Options blocks whose plumbing matches the standard except for listening on the instance's own IPv6 address get the _common/options-dual.conf.j2 template. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/cache_delegns/ns1/named.conf.j2 b/bin/tests/system/cache_delegns/ns1/named.conf.j2 index a17cb870904..d021429c2b4 100644 --- a/bin/tests/system/cache_delegns/ns1/named.conf.j2 +++ b/bin/tests/system/cache_delegns/ns1/named.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/catz/ns2/named.conf.j2 b/bin/tests/system/catz/ns2/named.conf.j2 index d29e65dfc02..850b4af9499 100644 --- a/bin/tests/system/catz/ns2/named.conf.j2 +++ b/bin/tests/system/catz/ns2/named.conf.j2 @@ -7,16 +7,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} allow-transfer { any; }; notify no; notify-delay 0; diff --git a/bin/tests/system/catz/ns2/named7.conf.j2 b/bin/tests/system/catz/ns2/named7.conf.j2 index 7abea92eb8a..2f9be47d171 100644 --- a/bin/tests/system/catz/ns2/named7.conf.j2 +++ b/bin/tests/system/catz/ns2/named7.conf.j2 @@ -1,16 +1,7 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} allow-transfer { any; }; notify no; notify-delay 0; diff --git a/bin/tests/system/catz/ns3/named.conf.j2 b/bin/tests/system/catz/ns3/named.conf.j2 index 1e2ac13b78f..513509935cc 100644 --- a/bin/tests/system/catz/ns3/named.conf.j2 +++ b/bin/tests/system/catz/ns3/named.conf.j2 @@ -1,18 +1,9 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.3; - query-source-v6 address fd92:7065:b8e:ffff::3; - notify-source 10.53.0.3; - notify-source-v6 fd92:7065:b8e:ffff::3; - transfer-source 10.53.0.3; - transfer-source-v6 fd92:7065:b8e:ffff::3; - port @PORT@; + {% include_indented "_common/options-dual.conf.j2" %} allow-new-zones yes; - pid-file "named.pid"; provide-ixfr no; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; allow-transfer { any; }; notify no; notify-delay 0; diff --git a/bin/tests/system/catz/ns4/named.conf.j2 b/bin/tests/system/catz/ns4/named.conf.j2 index 4886bfa1e3a..2a2fb41213c 100644 --- a/bin/tests/system/catz/ns4/named.conf.j2 +++ b/bin/tests/system/catz/ns4/named.conf.j2 @@ -1,17 +1,8 @@ {% include "_common/controls.conf.j2" %} options { - query-source address 10.53.0.4; - query-source-v6 address fd92:7065:b8e:ffff::4; - notify-source 10.53.0.4; - notify-source-v6 fd92:7065:b8e:ffff::4; - transfer-source 10.53.0.4; - transfer-source-v6 fd92:7065:b8e:ffff::4; - port @PORT@; + {% include_indented "_common/options-dual.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { fd92:7065:b8e:ffff::4; }; allow-transfer { any; }; notify no; notify-delay 0; diff --git a/bin/tests/system/chain/ns7/named.conf.j2 b/bin/tests/system/chain/ns7/named.conf.j2 index 35d274f25d3..7b7b1d6a2a1 100644 --- a/bin/tests/system/chain/ns7/named.conf.j2 +++ b/bin/tests/system/chain/ns7/named.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.7; - query-source-v6 address fd92:7065:b8e:ffff::7; - notify-source 10.53.0.7; - notify-source-v6 fd92:7065:b8e:ffff::7; - transfer-source 10.53.0.7; - transfer-source-v6 fd92:7065:b8e:ffff::7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { fd92:7065:b8e:ffff::7; }; + {% include_indented "_common/options-dual.conf.j2" %} allow-recursion { any; }; dnssec-validation no; deny-answer-aliases { diff --git a/bin/tests/system/digdelv/ns1/named.conf.j2 b/bin/tests/system/digdelv/ns1/named.conf.j2 index c22baaf2103..e705e818e97 100644 --- a/bin/tests/system/digdelv/ns1/named.conf.j2 +++ b/bin/tests/system/digdelv/ns1/named.conf.j2 @@ -1,16 +1,7 @@ // NS1 options { - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/digdelv/ns2/named.conf.j2 b/bin/tests/system/digdelv/ns2/named.conf.j2 index e11cf56b9dd..a24eeb69867 100644 --- a/bin/tests/system/digdelv/ns2/named.conf.j2 +++ b/bin/tests/system/digdelv/ns2/named.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; minimal-any no; diff --git a/bin/tests/system/digdelv/ns3/named.conf.j2 b/bin/tests/system/digdelv/ns3/named.conf.j2 index a91b67b8e3b..b965d96e34f 100644 --- a/bin/tests/system/digdelv/ns3/named.conf.j2 +++ b/bin/tests/system/digdelv/ns3/named.conf.j2 @@ -1,14 +1,5 @@ options { - notify-source 10.53.0.3; - notify-source-v6 fd92:7065:b8e:ffff::3; - transfer-source 10.53.0.3; - transfer-source-v6 fd92:7065:b8e:ffff::3; - query-source address 10.53.0.3; - query-source-v6 address fd92:7065:b8e:ffff::3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; server-id "ns3"; minimal-any no; diff --git a/bin/tests/system/dispatch/ns1/named.conf.j2 b/bin/tests/system/dispatch/ns1/named.conf.j2 index 7573a5308e1..0bd3f71dbaf 100644 --- a/bin/tests/system/dispatch/ns1/named.conf.j2 +++ b/bin/tests/system/dispatch/ns1/named.conf.j2 @@ -1,18 +1,9 @@ {% include "_common/controls.conf.j2" %} options { - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options-dual.conf.j2" %} - listen-on { 10.53.0.1; }; - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; - query-source-v6 address fd92:7065:b8e:ffff::1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source-v6 fd92:7065:b8e:ffff::1; recursion no; servfail-ttl 0; diff --git a/bin/tests/system/dispatch/ns2/named.conf.j2 b/bin/tests/system/dispatch/ns2/named.conf.j2 index f183e403654..29a90f62e82 100644 --- a/bin/tests/system/dispatch/ns2/named.conf.j2 +++ b/bin/tests/system/dispatch/ns2/named.conf.j2 @@ -1,18 +1,9 @@ {% include "_common/controls.conf.j2" %} options { - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options-dual.conf.j2" %} - listen-on { 10.53.0.2; }; - query-source address 10.53.0.2; - notify-source 10.53.0.2; - transfer-source 10.53.0.2; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source-v6 fd92:7065:b8e:ffff::2; servfail-ttl 0; dnssec-validation no; diff --git a/bin/tests/system/filters/ns1/named.conf.j2 b/bin/tests/system/filters/ns1/named.conf.j2 index 7c69544cad7..c15d9956038 100644 --- a/bin/tests/system/filters/ns1/named.conf.j2 +++ b/bin/tests/system/filters/ns1/named.conf.j2 @@ -2,16 +2,7 @@ {% set family = family | default("v4") %} options { - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/filters/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 index 0a49beb2f98..3f877c2f835 100644 --- a/bin/tests/system/filters/ns2/named.conf.j2 +++ b/bin/tests/system/filters/ns2/named.conf.j2 @@ -2,16 +2,7 @@ {% set family = family | default("v4") %} options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/filters/ns3/named.conf.j2 b/bin/tests/system/filters/ns3/named.conf.j2 index 1c8b245d203..a4b95797783 100644 --- a/bin/tests/system/filters/ns3/named.conf.j2 +++ b/bin/tests/system/filters/ns3/named.conf.j2 @@ -2,16 +2,7 @@ {% set family = family | default("v4") %} options { - query-source address 10.53.0.3; - query-source-v6 address fd92:7065:b8e:ffff::3; - notify-source 10.53.0.3; - notify-source-v6 fd92:7065:b8e:ffff::3; - transfer-source 10.53.0.3; - transfer-source-v6 fd92:7065:b8e:ffff::3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation yes; minimal-responses no; }; diff --git a/bin/tests/system/filters/ns4/named.conf.j2 b/bin/tests/system/filters/ns4/named.conf.j2 index 7068eb10b38..86ca2e9ad85 100644 --- a/bin/tests/system/filters/ns4/named.conf.j2 +++ b/bin/tests/system/filters/ns4/named.conf.j2 @@ -2,16 +2,7 @@ {% set family = family | default("v4") %} options { - query-source address 10.53.0.4; - query-source-v6 address fd92:7065:b8e:ffff::4; - notify-source 10.53.0.4; - notify-source-v6 fd92:7065:b8e:ffff::4; - transfer-source 10.53.0.4; - transfer-source-v6 fd92:7065:b8e:ffff::4; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { fd92:7065:b8e:ffff::4; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; minimal-responses no; diff --git a/bin/tests/system/filters/ns5/named.conf.j2 b/bin/tests/system/filters/ns5/named.conf.j2 index 2b18146fb43..80365ab2afa 100644 --- a/bin/tests/system/filters/ns5/named.conf.j2 +++ b/bin/tests/system/filters/ns5/named.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.5; - query-source-v6 address fd92:7065:b8e:ffff::5; - notify-source 10.53.0.5; - notify-source-v6 fd92:7065:b8e:ffff::5; - transfer-source 10.53.0.5; - transfer-source-v6 fd92:7065:b8e:ffff::5; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.5; }; - listen-on-v6 { fd92:7065:b8e:ffff::5; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; dns64 64:ff9b::/96 { clients { any; }; diff --git a/bin/tests/system/forward/ns1/named.conf.j2 b/bin/tests/system/forward/ns1/named.conf.j2 index f0bf86ba7f9..e09d2c351e0 100644 --- a/bin/tests/system/forward/ns1/named.conf.j2 +++ b/bin/tests/system/forward/ns1/named.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/forward/ns2/named.conf.j2 b/bin/tests/system/forward/ns2/named.conf.j2 index af7033b5d50..e7377e748ee 100644 --- a/bin/tests/system/forward/ns2/named.conf.j2 +++ b/bin/tests/system/forward/ns2/named.conf.j2 @@ -3,16 +3,7 @@ include "named-tls.conf"; {% endif %} options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; diff --git a/bin/tests/system/forward/ns3/named.conf.j2 b/bin/tests/system/forward/ns3/named.conf.j2 index ba8880c0eb0..883928e4ba6 100644 --- a/bin/tests/system/forward/ns3/named.conf.j2 +++ b/bin/tests/system/forward/ns3/named.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.3; - query-source-v6 address fd92:7065:b8e:ffff::3; - notify-source 10.53.0.3; - notify-source-v6 fd92:7065:b8e:ffff::3; - transfer-source 10.53.0.3; - transfer-source-v6 fd92:7065:b8e:ffff::3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; + {% include_indented "_common/options-dual.conf.j2" %} forwarders { fd92:7065:b8e:ffff::2; }; forward first; dnssec-validation no; diff --git a/bin/tests/system/forward/ns3/named2.conf.j2 b/bin/tests/system/forward/ns3/named2.conf.j2 index 117ab49e3ab..70ae26de70b 100644 --- a/bin/tests/system/forward/ns3/named2.conf.j2 +++ b/bin/tests/system/forward/ns3/named2.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.3; - query-source-v6 address fd92:7065:b8e:ffff::3; - notify-source 10.53.0.3; - notify-source-v6 fd92:7065:b8e:ffff::3; - transfer-source 10.53.0.3; - transfer-source-v6 fd92:7065:b8e:ffff::3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; + {% include_indented "_common/options-dual.conf.j2" %} forwarders { 10.53.0.6; }; dnssec-validation yes; }; diff --git a/bin/tests/system/geoip2/ns2/named.conf.j2 b/bin/tests/system/geoip2/ns2/named.conf.j2 index 8a60628d4b4..e8f826a2d93 100644 --- a/bin/tests/system/geoip2/ns2/named.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named10.conf.j2 b/bin/tests/system/geoip2/ns2/named10.conf.j2 index 24c4c8e3527..3f580c52e5a 100644 --- a/bin/tests/system/geoip2/ns2/named10.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named10.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named11.conf.j2 b/bin/tests/system/geoip2/ns2/named11.conf.j2 index 944a15b08e7..f1182885204 100644 --- a/bin/tests/system/geoip2/ns2/named11.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named11.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named12.conf.j2 b/bin/tests/system/geoip2/ns2/named12.conf.j2 index caecccb0bf5..ca1243ea939 100644 --- a/bin/tests/system/geoip2/ns2/named12.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named12.conf.j2 @@ -5,16 +5,7 @@ acl blocking { }; options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named3.conf.j2 b/bin/tests/system/geoip2/ns2/named3.conf.j2 index 477db13e30e..cac468e1480 100644 --- a/bin/tests/system/geoip2/ns2/named3.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named3.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named4.conf.j2 b/bin/tests/system/geoip2/ns2/named4.conf.j2 index 92b5dc34c42..5b2ff9c9293 100644 --- a/bin/tests/system/geoip2/ns2/named4.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named4.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named5.conf.j2 b/bin/tests/system/geoip2/ns2/named5.conf.j2 index 10b3cd85853..a432fe414bb 100644 --- a/bin/tests/system/geoip2/ns2/named5.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named5.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named6.conf.j2 b/bin/tests/system/geoip2/ns2/named6.conf.j2 index 9d7acc304f7..4e7bef090ea 100644 --- a/bin/tests/system/geoip2/ns2/named6.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named6.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named7.conf.j2 b/bin/tests/system/geoip2/ns2/named7.conf.j2 index cd7f36a618b..6840ab6d1a7 100644 --- a/bin/tests/system/geoip2/ns2/named7.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named7.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named8.conf.j2 b/bin/tests/system/geoip2/ns2/named8.conf.j2 index f0de194f9f7..67ee9a35d25 100644 --- a/bin/tests/system/geoip2/ns2/named8.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named8.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/geoip2/ns2/named9.conf.j2 b/bin/tests/system/geoip2/ns2/named9.conf.j2 index 6c5c1107343..66b755902ef 100644 --- a/bin/tests/system/geoip2/ns2/named9.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named9.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/idna/ns1/named.conf.j2 b/bin/tests/system/idna/ns1/named.conf.j2 index c22baaf2103..e705e818e97 100644 --- a/bin/tests/system/idna/ns1/named.conf.j2 +++ b/bin/tests/system/idna/ns1/named.conf.j2 @@ -1,16 +1,7 @@ // NS1 options { - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2 index 05a76d6162f..931f6d6e1eb 100644 --- a/bin/tests/system/notify/ns3/named.conf.j2 +++ b/bin/tests/system/notify/ns3/named.conf.j2 @@ -3,16 +3,7 @@ include "named-tls.conf"; {% endif %} options { - query-source address 10.53.0.3; - query-source-v6 address fd92:7065:b8e:ffff::3; - notify-source 10.53.0.3; - notify-source-v6 fd92:7065:b8e:ffff::3; - transfer-source 10.53.0.3; - transfer-source-v6 fd92:7065:b8e:ffff::3; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; tcp-initial-timeout 150; # 15 seconds diff --git a/bin/tests/system/nsupdate/ns6/named.conf.j2 b/bin/tests/system/nsupdate/ns6/named.conf.j2 index 41ade5b2aa5..a4182095986 100644 --- a/bin/tests/system/nsupdate/ns6/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns6/named.conf.j2 @@ -1,15 +1,6 @@ options { - query-source address 10.53.0.6; - notify-source 10.53.0.6; - transfer-source 10.53.0.6; - query-source-v6 address fd92:7065:b8e:ffff::6; - notify-source-v6 fd92:7065:b8e:ffff::6; - transfer-source-v6 fd92:7065:b8e:ffff::6; - port @PORT@; - pid-file "named.pid"; + {% include_indented "_common/options-dual.conf.j2" %} session-keyfile "session.key"; - listen-on { 10.53.0.6; }; - listen-on-v6 { fd92:7065:b8e:ffff::6; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/resolver/ns6/named.conf.j2 b/bin/tests/system/resolver/ns6/named.conf.j2 index c3fbadd7f67..c99c25d208b 100644 --- a/bin/tests/system/resolver/ns6/named.conf.j2 +++ b/bin/tests/system/resolver/ns6/named.conf.j2 @@ -1,16 +1,7 @@ // NS6 options { - query-source address 10.53.0.6; - query-source-v6 address fd92:7065:b8e:ffff::6; - notify-source 10.53.0.6; - notify-source-v6 fd92:7065:b8e:ffff::6; - transfer-source 10.53.0.6; - transfer-source-v6 fd92:7065:b8e:ffff::6; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.6; }; - listen-on-v6 { fd92:7065:b8e:ffff::6; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; querylog yes; diff --git a/bin/tests/system/resolver/ns7/named.conf.j2 b/bin/tests/system/resolver/ns7/named.conf.j2 index 5c9745a7c91..681a0dbe6e0 100644 --- a/bin/tests/system/resolver/ns7/named.conf.j2 +++ b/bin/tests/system/resolver/ns7/named.conf.j2 @@ -1,16 +1,7 @@ // NS7 options { - query-source address 10.53.0.7; - query-source-v6 address fd92:7065:b8e:ffff::7; - notify-source 10.53.0.7; - notify-source-v6 fd92:7065:b8e:ffff::7; - transfer-source 10.53.0.7; - transfer-source-v6 fd92:7065:b8e:ffff::7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { fd92:7065:b8e:ffff::7; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; empty-zones-enable yes; disable-empty-zone 20.172.in-addr.arpa; diff --git a/bin/tests/system/resolver/ns7/named2.conf.j2 b/bin/tests/system/resolver/ns7/named2.conf.j2 index 117fe7cb805..b5cd7497e9f 100644 --- a/bin/tests/system/resolver/ns7/named2.conf.j2 +++ b/bin/tests/system/resolver/ns7/named2.conf.j2 @@ -1,16 +1,7 @@ // NS7 options { - query-source address 10.53.0.7; - query-source-v6 address fd92:7065:b8e:ffff::7; - notify-source 10.53.0.7; - notify-source-v6 fd92:7065:b8e:ffff::7; - transfer-source 10.53.0.7; - transfer-source-v6 fd92:7065:b8e:ffff::7; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.7; }; - listen-on-v6 { fd92:7065:b8e:ffff::7; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; empty-zones-enable yes; disable-empty-zone 20.172.in-addr.arpa; diff --git a/bin/tests/system/runtime/ns2/named1.conf.j2 b/bin/tests/system/runtime/ns2/named1.conf.j2 index 8c7f5164a49..79f036a5061 100644 --- a/bin/tests/system/runtime/ns2/named1.conf.j2 +++ b/bin/tests/system/runtime/ns2/named1.conf.j2 @@ -1,16 +1,7 @@ // NS2 options { - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/runtime/ns2/named5.conf.j2 b/bin/tests/system/runtime/ns2/named5.conf.j2 index 4cbfaa78bf3..eaa8a132ff5 100644 --- a/bin/tests/system/runtime/ns2/named5.conf.j2 +++ b/bin/tests/system/runtime/ns2/named5.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/runtime/ns2/named6.conf.j2 b/bin/tests/system/runtime/ns2/named6.conf.j2 index 9241750a10e..1a5eaa6d7a5 100644 --- a/bin/tests/system/runtime/ns2/named6.conf.j2 +++ b/bin/tests/system/runtime/ns2/named6.conf.j2 @@ -1,14 +1,5 @@ options { - query-source address 10.53.0.2; - query-source-v6 address fd92:7065:b8e:ffff::2; - notify-source 10.53.0.2; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source 10.53.0.2; - transfer-source-v6 fd92:7065:b8e:ffff::2; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; + {% include_indented "_common/options-dual.conf.j2" %} dnssec-validation no; }; diff --git a/bin/tests/system/statschannel/ns1/named.conf.j2 b/bin/tests/system/statschannel/ns1/named.conf.j2 index 38f88ed6782..27b15fb8c74 100644 --- a/bin/tests/system/statschannel/ns1/named.conf.j2 +++ b/bin/tests/system/statschannel/ns1/named.conf.j2 @@ -1,15 +1,6 @@ options { - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - port @PORT@; + {% include_indented "_common/options-dual.conf.j2" %} tls-port @TLSPORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; listen-on-v6 tls ephemeral { fd92:7065:b8e:ffff::1; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/synthrecord/ns1/named.conf.j2 b/bin/tests/system/synthrecord/ns1/named.conf.j2 index 2bdf59abd87..d300f927f1e 100644 --- a/bin/tests/system/synthrecord/ns1/named.conf.j2 +++ b/bin/tests/system/synthrecord/ns1/named.conf.j2 @@ -2,16 +2,7 @@ {% set toolongprefix = toolongprefix | default(False) %} options { - notify-source 10.53.0.1; - notify-source-v6 fd92:7065:b8e:ffff::1; - transfer-source 10.53.0.1; - transfer-source-v6 fd92:7065:b8e:ffff::1; - query-source address 10.53.0.1; - query-source-v6 address fd92:7065:b8e:ffff::1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; + {% include_indented "_common/options-dual.conf.j2" %} recursion no; };