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 a17cb87090455c686900b63569fcf5a9afc98405..d021429c2b4d58a4f3b3b35b2dbd1a5e22e486fb 100644 (file)
--- 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 d29e65dfc02151bab3ba6dc089e55ed3f383ac76..850b4af94999519c403d09476233ad6dd837bc0b 100644 (file)
--- 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 7abea92eb8a101bb8af1501b5c67c3ca75b62ee5..2f9be47d17164e18b426059c772ca04525d4dfde 100644 (file)
--- 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 1e2ac13b78f482beda40df24185682ea1490a1bd..513509935ccb95d384701ba9786d9433ab736f48 100644 (file)
--- 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 4886bfa1e3a306128a7ca1af6fed37188cea3055..2a2fb41213cdd30f37095f9cf169866403084482 100644 (file)
--- 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 35d274f25d3886ddb215ed8657567b651c19ddcd..7b7b1d6a2a1cd6d81df83040505e52e4384da573 100644 (file)
--- 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 c22baaf21032ab9be9023636e7aed9c5d6134d8f..e705e818e9753fb0dd29a75a439d5379acbb834b 100644 (file)
--- 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 e11cf56b9ddf87feb977ad829937ab0222d06416..a24eeb6986737d939f6c3f844165b775c70ecf95 100644 (file)
--- 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 a91b67b8e3b852bfefd6daa73bb7c8af0f6b153f..b965d96e34f5e1c12c98ef74d77c9268ac3643d1 100644 (file)
--- 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 7573a5308e13b08a096322e9962bd922e3e4b1d5..0bd3f71dbafbdc874f30acd683d6dfbecb783c97 100644 (file)
--- 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 f183e403654ddee09f1033064aaa5a25b8fbfb01..29a90f62e82a6ed01a9a6fffd42da38eb1bd6763 100644 (file)
--- 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 7c69544cad722d8029a2d7531e3a21bd944b27c0..c15d9956038e4c273ace5db0572b0844e7768e3c 100644 (file)
--- 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 0a49beb2f98dd4ce333cc4d8bc54008674d55c2c..3f877c2f83524b92b1f5475fad60ab760069e085 100644 (file)
--- 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 1c8b245d203837bd0bfd31aa15b8414ff833c97b..a4b9579778360e115bf51131c9c428e500973df8 100644 (file)
--- 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 7068eb10b38b634da0c9360a1c7ceef54e3d3932..86ca2e9ad855fbbe32fee02bc396d4b24afc9f02 100644 (file)
--- 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 2b18146fb4350220c8e26e5552f8f130ce6ba4be..80365ab2afa5ad202579849b2cfdf3dd7590f039 100644 (file)
--- 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 f0bf86ba7f92b0cc21f34d5c29b407c32302af93..e09d2c351e03471c252b62a7620c189433687709 100644 (file)
--- 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 af7033b5d50ed3385d177bcc20d0928ec2fda205..e7377e748ee599cdc5d719d8a50309f7914735bf 100644 (file)
--- 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 ba8880c0eb0f7b9b25934be0c57b482878826299..883928e4ba65a50a3aa9616288df0eb4d9d1a74d 100644 (file)
--- 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 117ab49e3ab7997dab233c294f452c1905819c4b..70ae26de70b92cfd412a23d83f804232a70d3291 100644 (file)
--- 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 8a60628d4b4904604194afe1ed113e553cd2fb05..e8f826a2d93fa79948c889dc48988149728f79b2 100644 (file)
--- 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 24c4c8e35270ee67a01e10733b8180acdac57cad..3f580c52e5a7e7d8b46e3b3055c9e0ba38ee8a97 100644 (file)
--- 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 944a15b08e7fe16b20f4469d4e7196fd1311964f..f1182885204163be454e2e15570fc855147eb0b7 100644 (file)
--- 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 caecccb0bf55618146a353aee2dbc5126fcb385b..ca1243ea93981b8775b1b3933846ade68b80db81 100644 (file)
--- 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 477db13e30e24932e545581ecb804ee6ae608bf2..cac468e148009256846648563bdf7a445484c8e0 100644 (file)
--- 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 92b5dc34c429c1c188a80273d13badd3b443f2c4..5b2ff9c9293e22406e9f05646d95acbaebb9f70b 100644 (file)
--- 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 10b3cd85853e3bc3ef5a3fb335129f933939c57d..a432fe414bbc0298d01dcf13b326de77e80a87f4 100644 (file)
--- 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 9d7acc304f7032f67b4f9a71924e00e5f500fcc1..4e7bef090eafdf3f0d409eeb567d84bc66dff2b2 100644 (file)
--- 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 cd7f36a618b8dee804e004681452ad6905d1753e..6840ab6d1a73f94a73c76ce012416664291d72a2 100644 (file)
--- 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 f0de194f9f7aa160fffcd2002db21a6e3c19d2c7..67ee9a35d2595235f1c3db90fc258c06f03c615e 100644 (file)
--- 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 6c5c1107343ab94815384ddf527447c59ce0e3c0..66b755902ef4b3ac19344c16f289d2ae5b2a21dd 100644 (file)
--- 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 c22baaf21032ab9be9023636e7aed9c5d6134d8f..e705e818e9753fb0dd29a75a439d5379acbb834b 100644 (file)
--- 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 05a76d6162fe11b1fb26a900370c6b4b2d1a4288..931f6d6e1ebb2901519755e83830332784a93def 100644 (file)
--- 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 41ade5b2aa50a0b3643fce5c5e5ed2cecd670741..a418209598614828f22e9f082d22d58eea4b930e 100644 (file)
--- 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 c3fbadd7f67e12f70ec751f1896b3b54db3ee2b6..c99c25d208b563afea132db8cc62bf77ac7a5310 100644 (file)
--- 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 5c9745a7c91f5161d300e5be4e02ab4bf1ec11a1..681a0dbe6e0d586878bbb8dc27d3d4257b3cbdc4 100644 (file)
--- 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 117fe7cb805801bda8daf7d5a0c6d1fade6965b3..b5cd7497e9f0a6d34370b6726a081fd31b996b68 100644 (file)
--- 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 8c7f5164a49d0fb66380f48ad4dcf4bbe66a51be..79f036a5061ce881f3fd0fb5a67313c804ea157d 100644 (file)
--- 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 4cbfaa78bf30f554f2995fdf405f342b043f6ed5..eaa8a132ff56e204d17f6c6c785ee8eadc72be8c 100644 (file)
--- 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 9241750a10e6bf42714ea4f238ffdca3a8c9ba34..1a5eaa6d7a5fd30b89316c9e9b06c319975f0b2f 100644 (file)
--- 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 38f88ed67826b27c38b30c62c55d44158b716c9d..27b15fb8c741b923d4f38dcde4dee4fe6dd160f1 100644 (file)
--- 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 2bdf59abd878e154fb25fbd79ba5d0c46f263752..d300f927f1e7b3b40693f9e80f5a14f9eb71d2d1 100644 (file)
--- 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;
 };