From: Nicki Křížek Date: Thu, 23 Jul 2026 16:51:29 +0000 (+0000) Subject: Use partial options templates for non-standard named configs X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d79efe2dbc02c5b467206983b1b257ff504139f7;p=thirdparty%2Fbind9.git 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 3bec8458a97..c9e8359b0ee 100644 --- 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 ab7174a5a23..a481476223a 100644 --- 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 95ef6c72efb..e9e9a910516 100644 --- 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 a2c5e6f3eab..bafba133913 100644 --- 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 5330ecb2fa6..ed81cf3c614 100644 --- 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 0da28ee17c3..cea81a39058 100644 --- 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 efaf19c9abc..19e6972fa7e 100644 --- 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 19e9c634551..c9272cef6ea 100644 --- 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 861ec834f7a..c2c7ab7bb3f 100644 --- 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 699af379637..c16c43cc217 100644 --- 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 381de6707e8..d9fb336926c 100644 --- 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 7e229f3bb31..9e56bca3cf3 100644 --- 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 1261c663cea..a88ae5b062b 100644 --- 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 cdfb06c77fb..ea332d1906c 100644 --- 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 f1d7a2e8333..b143c3fb5f2 100644 --- 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 75df06ea6dc..4911ada4fc1 100644 --- 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 925a546681a..fe29079a097 100644 --- 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 3a7464d559d..fed49b469f8 100644 --- 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 c8a40314ef3..bbb476fc535 100644 --- 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 0bca7e895be..b835610b6e4 100644 --- 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 bdccdbe718a..5141852e79e 100644 --- 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 3c9397543cd..bacd873ed34 100644 --- 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 39f8bae666a..e5901faf5ef 100644 --- 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 1fb6b133464..f2cc2053fd9 100644 --- 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 ad4a040b518..ab7a9346c5f 100644 --- 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 ce504c78155..6a1c91ab018 100644 --- 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 153274bf85d..10d009bac1f 100644 --- 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 366a9479b31..b48dc0b1847 100644 --- 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 530e4af37fc..f98d2778b15 100644 --- 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 d6a671b5874..d8ab2e0b136 100644 --- 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 b9481dd72c8..8e29f8e4035 100644 --- 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 bdd30572642..0538153f925 100644 --- 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 fb0bfba7eb0..0c57785bd6c 100644 --- 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 a6cb487c537..d0898653021 100644 --- 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 249e8cbdb86..a13829e3016 100644 --- 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 e3ea33fa297..aeeab8c0660 100644 --- 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 eba0d795c77..60bbe2f7ce3 100644 --- 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 453bb9a1bb8..1f5b2bf1d43 100644 --- 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 3a798385526..9467f9c5c87 100644 --- 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 943596faba1..c074d3cfc21 100644 --- 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 ebc690af5b5..1dac37dc9f3 100644 --- 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 3a1610af086..4b7ca6f8436 100644 --- 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 71dd04a6c8c..431367cd137 100644 --- 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