Use partial options templates for non-standard named configs

The divergence from the standard plumbing is relevant for these tests
and needs to stay in place. Use partial templates for the common
statements which can be templated.

Assisted-by: Claude:claude-fable-5

diff --git a/bin/tests/system/addzone/ns2/named2.conf.j2 b/bin/tests/system/addzone/ns2/named2.conf.j2
index 3bec8458a972b46d2532d350feb1041f4921ce4f..c9e8359b0ee062d64e100a15976233051e143282 100644 (file)
--- a/bin/tests/system/addzone/ns2/named2.conf.j2
+++ b/bin/tests/system/addzone/ns2/named2.conf.j2
@@ -2,11 +2,8 @@
 
 
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.2; 10.53.0.4; };
        listen-on-v6 { none; };
        recursion no;

diff --git a/bin/tests/system/addzone/ns2/named3.conf.j2 b/bin/tests/system/addzone/ns2/named3.conf.j2
index ab7174a5a2350b7877ee7fd21133ebfdb23c8507..a481476223a50cca35ddf5cb9af4d43e7da8e0a2 100644 (file)
--- a/bin/tests/system/addzone/ns2/named3.conf.j2
+++ b/bin/tests/system/addzone/ns2/named3.conf.j2
@@ -1,11 +1,8 @@
 {% 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.2; 10.53.0.4; 10.53.0.5; };
        listen-on-v6 { none; };
        recursion no;

diff --git a/bin/tests/system/allow_query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2
index 95ef6c72efb4880495d33764cae6622dab9b6c8b..e9e9a910516a0b6773fcb23b7fb889e7c749cf5e 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named3.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named3.conf.j2
@@ -1,9 +1,6 @@
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.3; 10.53.1.2; };
        listen-on-v6 { none; };
        allow-recursion { any; };

diff --git a/bin/tests/system/allow_query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2
index a2c5e6f3eabfae9289588854609d9c463f0abb15..bafba1339133738ca34eaa9da705829322a42c9c 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named4.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named4.conf.j2
@@ -1,9 +1,6 @@
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.3; 10.53.1.2; };
        listen-on-v6 { none; };
        allow-recursion { any; };

diff --git a/bin/tests/system/allow_query/ns3/named5.conf.j2 b/bin/tests/system/allow_query/ns3/named5.conf.j2
index 5330ecb2fa66adc08f22dbe4abee4e4ec3e0116e..ed81cf3c6141799fcd0a73962556b84ab7ddbfb7 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named5.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named5.conf.j2
@@ -1,9 +1,6 @@
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.3; 10.53.1.2; };
        listen-on-v6 { none; };
        recursion no;

diff --git a/bin/tests/system/allow_query/ns3/named8.conf.j2 b/bin/tests/system/allow_query/ns3/named8.conf.j2
index 0da28ee17c32276dd89ed8f8c63fef6d83484a4d..cea81a390585b47909c426e584aa0555366791b8 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named8.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named8.conf.j2
@@ -1,9 +1,6 @@
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.3; 10.53.0.4; 10.53.1.2; };
        listen-on-v6 { none; };
        recursion no;

diff --git a/bin/tests/system/cache_delegns/ns2/named.conf.j2 b/bin/tests/system/cache_delegns/ns2/named.conf.j2
index efaf19c9abc072cf58d29999946c9a2ad2236112..19e6972fa7ecc1a9917a69f0e7300f98fbb8bc23 100644 (file)
--- a/bin/tests/system/cache_delegns/ns2/named.conf.j2
+++ b/bin/tests/system/cache_delegns/ns2/named.conf.j2
@@ -3,6 +3,8 @@
 {% set dns64 = dns64 | default(False) %}
 
 options {
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
 {% if disablev4 %}
        query-source address none;
 {% else %}
@@ -17,14 +19,10 @@ options {
 
        notify-source 10.53.0.2;
        transfer-source 10.53.0.2;
-       listen-on { 10.53.0.2; };
 
        notify-source-v6 fd92:7065:b8e:ffff::2;
        transfer-source-v6 fd92:7065:b8e:ffff::2;
-       listen-on-v6 { fd92:7065:b8e:ffff::2; };
 
-       port @PORT@;
-       pid-file "named.pid";
        dnssec-validation no;
 
 {% if dns64 %}

diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.j2 b/bin/tests/system/dlzexternal/ns1/named.conf.j2
index 19e9c63455177d7ba31bb878050f2e8b73048466..c9272cef6ea1a948cd0fad4afc9582d9fd283bbc 100644 (file)
--- a/bin/tests/system/dlzexternal/ns1/named.conf.j2
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.j2
@@ -1,9 +1,6 @@
 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        session-keyfile "session.key";
        listen-on { 10.53.0.1; 127.0.0.1; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/dns64/ns3/named.conf.j2 b/bin/tests/system/dns64/ns3/named.conf.j2
index 861ec834f7a93e6cad77d8b99820c14a44d9257d..c2c7ab7bb3f7a6f69b04410ba4e9f67278415efe 100644 (file)
--- a/bin/tests/system/dns64/ns3/named.conf.j2
+++ b/bin/tests/system/dns64/ns3/named.conf.j2
@@ -4,17 +4,11 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 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;
+       {% include_indented "_common/options/sources-dual.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
        port @EXTRAPORT1@;
        pid-file "named.pid";
        listen-on port @PORT@ { 10.53.0.3; };   // for start.pl
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { fd92:7065:b8e:ffff::3; };
        dnssec-validation no;
        allow-recursion { any; };
        resolver-use-dns64 yes;

diff --git a/bin/tests/system/dns64/ns4/named.conf.j2 b/bin/tests/system/dns64/ns4/named.conf.j2
index 699af379637f9c3efc15a28df5424e2d1c9af2c5..c16c43cc217087c6a73530f5ba6ae9d5f7184213 100644 (file)
--- a/bin/tests/system/dns64/ns4/named.conf.j2
+++ b/bin/tests/system/dns64/ns4/named.conf.j2
@@ -2,11 +2,9 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
+       {% include_indented "_common/options/sources.conf.j2" %}
        query-source-v6 address fd92:7065:b8e:fffe::10.53.0.4;
-       notify-source 10.53.0.4;
        notify-source-v6 fd92:7065:b8e:fffe::10.53.0.4;
-       transfer-source 10.53.0.4;
        transfer-source-v6 fd92:7065:b8e:fffe::10.53.0.4;
        port @EXTRAPORT1@;
        pid-file "named.pid";

diff --git a/bin/tests/system/dnssec/ns5/named.conf.j2 b/bin/tests/system/dnssec/ns5/named.conf.j2
index 381de6707e8eed66a990aecd15b769ce76a248d7..d9fb336926c114f2d79d23f14732d835c64c398a 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named.conf.j2
+++ b/bin/tests/system/dnssec/ns5/named.conf.j2
@@ -4,11 +4,8 @@
 {% set broken_key = broken_key | default(False) %}
 {% set many_anchors = many_anchors | default(False) %}
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.5; 127.0.0.1; };
        listen-on-v6 { none; };
        minimal-any no;

diff --git a/bin/tests/system/dyndb/ns1/named.conf.j2 b/bin/tests/system/dyndb/ns1/named.conf.j2
index 7e229f3bb31e14b968a426d87fd9220f4e828036..9e56bca3cf34ca4f00d4d26e298a77be34e87f33 100644 (file)
--- a/bin/tests/system/dyndb/ns1/named.conf.j2
+++ b/bin/tests/system/dyndb/ns1/named.conf.j2
@@ -1,9 +1,6 @@
 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        session-keyfile "session.key";
        listen-on { 10.53.0.1; 127.0.0.1; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/geoip2/ns2/named2.conf.j2 b/bin/tests/system/geoip2/ns2/named2.conf.j2
index 1261c663cea3396abbd9dd70adc9e299f63a800a..a88ae5b062b47d2ae1a0759109a9e9c548b9d236 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named2.conf.j2
+++ b/bin/tests/system/geoip2/ns2/named2.conf.j2
@@ -1,11 +1,8 @@
 // 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 127.0.0.1; 10.53.0.2; };
        listen-on-v6 { ::1; fd92:7065:b8e:ffff::2; };
        recursion no;

diff --git a/bin/tests/system/notify/ns4/named.conf.j2 b/bin/tests/system/notify/ns4/named.conf.j2
index cdfb06c77fb0bdffb06cf4ce89248b805ae5da44..ea332d1906ce7144f7bb99d9f481e7412cb14a69 100644 (file)
--- a/bin/tests/system/notify/ns4/named.conf.j2
+++ b/bin/tests/system/notify/ns4/named.conf.j2
@@ -1,11 +1,8 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/listen.conf.j2" %}
        port @EXTRAPORT1@;
        pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2
index f1d7a2e83333b499677eda7c0a8e105cb06978fa..b143c3fb5f221ae87c5922d9f52c754be1cb7a71 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2
@@ -12,11 +12,8 @@
  */
 
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on {
                10.53.0.2;
                10.53.0.5;

diff --git a/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2
index 75df06ea6dc3dae59658c86666990cd90b9cb698..4911ada4fc1fc638ccb7350571399bd56cb28dc7 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2
@@ -12,11 +12,8 @@
  */
 
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on {
                10.53.0.3;
        };

diff --git a/bin/tests/system/nsupdate/ns1/named.conf.j2 b/bin/tests/system/nsupdate/ns1/named.conf.j2
index 925a546681a2fb036af463269f200c66a614929c..fe29079a097eb34ec23b63eae524e1ebe7790263 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns1/named.conf.j2
@@ -3,11 +3,8 @@ include "tls.conf";
 {% endif %}
 
 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        session-keyfile "session.key";
        listen-on { 10.53.0.1; 127.0.0.1; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/proxy/ns1/named.conf.j2 b/bin/tests/system/proxy/ns1/named.conf.j2
index 3a7464d559db8d4630536b7133a3b5175612fa7b..fed49b469f855cb0c0f49653174bcee5ca78ee28 100644 (file)
--- a/bin/tests/system/proxy/ns1/named.conf.j2
+++ b/bin/tests/system/proxy/ns1/named.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic test
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/proxy/ns3/named.conf.j2 b/bin/tests/system/proxy/ns3/named.conf.j2
index c8a40314ef3d06b830dde1eaf1eef403af814f63..bbb476fc535badf68f19d65ba6ea7c473a1118b0 100644 (file)
--- a/bin/tests/system/proxy/ns3/named.conf.j2
+++ b/bin/tests/system/proxy/ns3/named.conf.j2
@@ -6,11 +6,8 @@ tls self-signed {
 };
 
 options {
-       port @PORT@;
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       pid-file "named.pid";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic test
        listen-on { 10.53.0.3; };

diff --git a/bin/tests/system/query_source/ns1/named.conf.j2 b/bin/tests/system/query_source/ns1/named.conf.j2
index 0bca7e895befe2e86defc66329cc67e26b8eaba2..b835610b6e4a9b5deadb0324f2343d37a1133a03 100644 (file)
--- a/bin/tests/system/query_source/ns1/named.conf.j2
+++ b/bin/tests/system/query_source/ns1/named.conf.j2
@@ -1,10 +1,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on-v6 { fd92:7065:b8e:ffff::1; };
-       listen-on { 10.53.0.1; };
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
        recursion no;
        dnssec-validation no;
        query-source 10.53.0.1;

diff --git a/bin/tests/system/query_source/ns2/named.conf.j2 b/bin/tests/system/query_source/ns2/named.conf.j2
index bdccdbe718a2bc162c6bc430c9751d06acca5e6e..5141852e79ef12e0f75021a0733472d2ec994b94 100644 (file)
--- a/bin/tests/system/query_source/ns2/named.conf.j2
+++ b/bin/tests/system/query_source/ns2/named.conf.j2
@@ -1,10 +1,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { fd92:7065:b8e:ffff::2; };
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
        dnssec-validation no;
        query-source none;
        query-source-v6 fd92:7065:b8e:ffff::2;

diff --git a/bin/tests/system/query_source/ns3/named.conf.j2 b/bin/tests/system/query_source/ns3/named.conf.j2
index 3c9397543cd295d071582ce41934a64144bd4ab4..bacd873ed34b14b5c555963dcfbfaedc7d7e762b 100644 (file)
--- a/bin/tests/system/query_source/ns3/named.conf.j2
+++ b/bin/tests/system/query_source/ns3/named.conf.j2
@@ -1,10 +1,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { fd92:7065:b8e:ffff::3; };
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
        dnssec-validation no;
        query-source-v6 none;
        query-source 10.53.0.3;

diff --git a/bin/tests/system/query_source/ns4/named.conf.j2 b/bin/tests/system/query_source/ns4/named.conf.j2
index 39f8bae666aea5c31f7c196f7bd86aed2d4348ed..e5901faf5ef605b13b9be22a23003e494f368743 100644 (file)
--- a/bin/tests/system/query_source/ns4/named.conf.j2
+++ b/bin/tests/system/query_source/ns4/named.conf.j2
@@ -1,10 +1,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { fd92:7065:b8e:ffff::4; };
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
        dnssec-validation no;
        query-source none;
        query-source-v6 fd92:7065:b8e:ffff::4;

diff --git a/bin/tests/system/query_source/ns5/named.conf.j2 b/bin/tests/system/query_source/ns5/named.conf.j2
index 1fb6b13346468806e212e50b61953d7cad86e745..f2cc2053fd9e1f65d454371a94cf6d0f8c274029 100644 (file)
--- a/bin/tests/system/query_source/ns5/named.conf.j2
+++ b/bin/tests/system/query_source/ns5/named.conf.j2
@@ -1,10 +1,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { fd92:7065:b8e:ffff::5; };
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen-dual.conf.j2" %}
        dnssec-validation no;
        query-source 10.53.0.5;
        query-source-v6 none;

diff --git a/bin/tests/system/redirect/ns4/named.conf.j2 b/bin/tests/system/redirect/ns4/named.conf.j2
index ad4a040b51805f6ecb3145174deb56382dcad7d8..ab7a9346c5fa98c7979450f0fb8a0f9c09e7d53b 100644 (file)
--- a/bin/tests/system/redirect/ns4/named.conf.j2
+++ b/bin/tests/system/redirect/ns4/named.conf.j2
@@ -3,13 +3,11 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen.conf.j2" %}
        query-source address 10.53.0.2; /* note this is not 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; };
        dnssec-validation no;
        nxdomain-redirect "redirect";
 };

diff --git a/bin/tests/system/resolver/ns9/named.conf.j2 b/bin/tests/system/resolver/ns9/named.conf.j2
index ce504c7815501d4fee3bd92273b000a65e61cc7c..6a1c91ab018227ee497109c7dfc6f1e96ae7222f 100644 (file)
--- a/bin/tests/system/resolver/ns9/named.conf.j2
+++ b/bin/tests/system/resolver/ns9/named.conf.j2
@@ -1,11 +1,8 @@
 // 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { none; };
        listen-on-v6 { fd92:7065:b8e:ffff::9; };
        recursive-clients 0; // regression test for [GL #4987]

diff --git a/bin/tests/system/runtime/ns2/named7.conf.j2 b/bin/tests/system/runtime/ns2/named7.conf.j2
index 153274bf85dad3ce9bcbac59096177ad540540a6..10d009bac1f97876fbf5e91627b6b572e7998abd 100644 (file)
--- a/bin/tests/system/runtime/ns2/named7.conf.j2
+++ b/bin/tests/system/runtime/ns2/named7.conf.j2
@@ -1,11 +1,8 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/listen.conf.j2" %}
        port @PORT@;
        pid-file "named7.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/selfpointedglue/ns3/named.conf.j2 b/bin/tests/system/selfpointedglue/ns3/named.conf.j2
index 366a9479b319522e0770b4c65d155cbac726c421..b48dc0b1847b411608ab6ed6de8e845cd0933778 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns3/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns3/named.conf.j2
@@ -12,11 +12,8 @@
  */
 
 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on {
                10.53.0.3;
                10.53.0.5;

diff --git a/bin/tests/system/staticstub/ns4/named.conf.j2 b/bin/tests/system/staticstub/ns4/named.conf.j2
index 530e4af37fc96ff2df02a60a75f9bab755fd35c0..f98d2778b153013b2f325eb6cc6771537fbcd4c4 100644 (file)
--- a/bin/tests/system/staticstub/ns4/named.conf.j2
+++ b/bin/tests/system/staticstub/ns4/named.conf.j2
@@ -1,9 +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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.4; };
        listen-on-v6 { ::1; };
        recursion no;

diff --git a/bin/tests/system/statschannel/ns3/named.conf.j2 b/bin/tests/system/statschannel/ns3/named.conf.j2
index d6a671b5874741b18988fa61ec490b5972067697..d8ab2e0b136e67b0dc32ff4e75031770798ac64b 100644 (file)
--- a/bin/tests/system/statschannel/ns3/named.conf.j2
+++ b/bin/tests/system/statschannel/ns3/named.conf.j2
@@ -1,15 +1,8 @@
 options {
-       query-source address 10.53.0.3;
-       query-source-v6 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/sources-dual.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2 b/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2
index b9481dd72c881b6a8b63d899e659040f881d2c6e..8e29f8e4035b244a56c99d526b0a8bb9225a1316 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2
index bdd3057264282d8c8a31618a9b0ec39f6da4151d..0538153f925b9ee71c6d7de976b0968b182a0aa5 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2 b/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2
index fb0bfba7eb07cf6e7f66a202fdd9155b66bb4cfa..0c57785bd6ce0a42bec6458c468ff01c8886ab5d 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2
index a6cb487c53723b4c10bbd0f2089e0fe0443e76fd..d0898653021a6ad73a469a8a04f51be96314ff99 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-https.conf.j2 b/bin/tests/system/transport_change/ns1/named-https.conf.j2
index 249e8cbdb862d950d2920c24337c531bf22cd58c..a13829e30168f266cbda070bc5d781bd4bb227a0 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-https.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-https.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-proxy.conf.j2 b/bin/tests/system/transport_change/ns1/named-proxy.conf.j2
index e3ea33fa297ffc94fd4e336da37f4f6757f81cc4..aeeab8c06609f89d4dc8669c6fb776b2ee8f756a 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-proxy.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-proxy.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2
index eba0d795c77e5e038a8e9c2e0e46e24bd6dfeb95..60bbe2f7ce3ec5c088cd63b11067f05eae8eca63 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2
index 453bb9a1bb820dd8c3b0d330f85eb828ab369925..1f5b2bf1d43a900c149c01524348968b7e7cfe11 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named-tls.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls.conf.j2
index 3a7983855268fc793280123a7b62827acaf8c712..9467f9c5c871869ed492a0bc9121c3a91b31105c 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-tls.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-tls.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/transport_change/ns1/named.conf.j2 b/bin/tests/system/transport_change/ns1/named.conf.j2
index 943596faba199402d63707da5174634808e8c966..c074d3cfc21dbb81d462f568768fda04808e0e18 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named.conf.j2
@@ -6,11 +6,8 @@ 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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        ##
        # generic
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/tsiggss/ns1/named.conf.j2 b/bin/tests/system/tsiggss/ns1/named.conf.j2
index ebc690af5b519f56cd5eed0555467ea2a805f1f8..1dac37dc9f389114b71b6f4adf3cdaf1a1bcbb29 100644 (file)
--- a/bin/tests/system/tsiggss/ns1/named.conf.j2
+++ b/bin/tests/system/tsiggss/ns1/named.conf.j2
@@ -1,9 +1,6 @@
 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";
+       {% include_indented "_common/options/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        session-keyfile "session.key";
        listen-on { 10.53.0.1; 127.0.0.1; };
        listen-on-v6 { none; };

diff --git a/bin/tests/system/views/ns2/named2.conf.j2 b/bin/tests/system/views/ns2/named2.conf.j2
index 3a1610af08659dee77a4aa34e8a352a2c7080f1b..4b7ca6f8436fd42a1cabb01de4de8769d801d6cb 100644 (file)
--- a/bin/tests/system/views/ns2/named2.conf.j2
+++ b/bin/tests/system/views/ns2/named2.conf.j2
@@ -1,9 +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/sources.conf.j2" %}
+       {% include_indented "_common/options/server.conf.j2" %}
        listen-on { 10.53.0.2; 10.53.0.4; };
        listen-on-v6 { none; };
        allow-transfer { any; };

diff --git a/bin/tests/system/xfer_servers_list/ns1/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns1/named.conf.j2
index 71dd04a6c8c9622082493d9269e345913a7dedb8..431367cd137ace7608a1a455595fb84210c11670 100644 (file)
--- a/bin/tests/system/xfer_servers_list/ns1/named.conf.j2
+++ b/bin/tests/system/xfer_servers_list/ns1/named.conf.j2
@@ -1,10 +1,8 @@
 options {
-       port @PORT@;
+       {% include_indented "_common/options/server.conf.j2" %}
+       {% include_indented "_common/options/listen.conf.j2" %}
        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";
        recursion no;
        /*
         * Notifications are sent from 10.53.1.1. This, the `notify