From: Nicki Křížek Date: Thu, 23 Jul 2026 17:14:14 +0000 (+0000) Subject: Use the ns variable for instance addresses in config templates X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b08d0d7e1b90868e99a47492f2c098a27b941e1f;p=thirdparty%2Fbind9.git Use the ns variable for instance addresses in config templates Statements referring to the instance's own address were switched to use the @ns.ip@ and @ns.ip6@ variable syntax. References to other nsX servers are kept as plain addresses. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2 index ea1b90db79c..c6d75dcb981 100644 --- a/bin/tests/system/acl/ns2/named3.conf.j2 +++ b/bin/tests/system/acl/ns2/named3.conf.j2 @@ -28,7 +28,7 @@ acl reject { }; acl accept { - 10.53.0.1; 10.53.0.2; + 10.53.0.1; @ns.ip@; }; {% include "_common/root.hint.conf" %} diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2 index db2ca0cb594..02f03d298dc 100644 --- a/bin/tests/system/acl/ns2/named4.conf.j2 +++ b/bin/tests/system/acl/ns2/named4.conf.j2 @@ -23,12 +23,12 @@ acl rejectkeys { }; acl rejectaddrs { - !10.53.0.1; !10.53.0.2; any; + !10.53.0.1; !@ns.ip@; any; }; acl check1 { !key one; 10.53.0.1; }; -acl check2 { !key two; 10.53.0.2; }; +acl check2 { !key two; @ns.ip@; }; {% include "_common/root.hint.conf" %} diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2 index ea34e269d0f..080e9e12545 100644 --- a/bin/tests/system/acl/ns2/named5.conf.j2 +++ b/bin/tests/system/acl/ns2/named5.conf.j2 @@ -6,7 +6,7 @@ options { ixfr-from-differences yes; check-integrity no; dnssec-validation no; - allow-query-on { 10.53.0.2; }; + allow-query-on { @ns.ip@; }; blackhole { 10.53.0.8; }; }; diff --git a/bin/tests/system/addzone/ns2/named2.conf.j2 b/bin/tests/system/addzone/ns2/named2.conf.j2 index c168712ead4..275c4df2d7e 100644 --- a/bin/tests/system/addzone/ns2/named2.conf.j2 +++ b/bin/tests/system/addzone/ns2/named2.conf.j2 @@ -4,7 +4,7 @@ options { {% 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 { @ns.ip@; 10.53.0.4; }; listen-on-v6 { none; }; recursion no; dnssec-validation no; @@ -17,7 +17,7 @@ template primary { }; view internal { - match-clients { 10.53.0.2; }; + match-clients { @ns.ip@; }; allow-new-zones no; recursion yes; diff --git a/bin/tests/system/addzone/ns2/named3.conf.j2 b/bin/tests/system/addzone/ns2/named3.conf.j2 index 1356d1dffe2..3e2edec08a9 100644 --- a/bin/tests/system/addzone/ns2/named3.conf.j2 +++ b/bin/tests/system/addzone/ns2/named3.conf.j2 @@ -3,7 +3,7 @@ options { {% 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 { @ns.ip@; 10.53.0.4; 10.53.0.5; }; listen-on-v6 { none; }; recursion no; new-zones-directory "new-zones"; @@ -17,7 +17,7 @@ template primary { }; view internal { - match-clients { 10.53.0.2; }; + match-clients { @ns.ip@; }; allow-new-zones no; recursion yes; diff --git a/bin/tests/system/allow_query/ns2/named04.conf.j2 b/bin/tests/system/allow_query/ns2/named04.conf.j2 index 10626932627..99738465254 100644 --- a/bin/tests/system/allow_query/ns2/named04.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named04.conf.j2 @@ -1,7 +1,7 @@ options { {% include_indented "_common/options.conf.j2" %} recursion no; - allow-query { 10.53.0.2; }; + allow-query { @ns.ip@; }; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named06.conf.j2 b/bin/tests/system/allow_query/ns2/named06.conf.j2 index 223ee6ad09a..671825d12ba 100644 --- a/bin/tests/system/allow_query/ns2/named06.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named06.conf.j2 @@ -1,7 +1,7 @@ options { {% include_indented "_common/options.conf.j2" %} recursion no; - allow-query {! 10.53.0.2; }; + allow-query {! @ns.ip@; }; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns2/named07.conf.j2 b/bin/tests/system/allow_query/ns2/named07.conf.j2 index f8128756f88..09142f8f940 100644 --- a/bin/tests/system/allow_query/ns2/named07.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named07.conf.j2 @@ -1,4 +1,4 @@ -acl accept { 10.53.0.2; }; +acl accept { @ns.ip@; }; options { {% include_indented "_common/options.conf.j2" %} diff --git a/bin/tests/system/allow_query/ns2/named09.conf.j2 b/bin/tests/system/allow_query/ns2/named09.conf.j2 index 95a991baf45..01c66d61b91 100644 --- a/bin/tests/system/allow_query/ns2/named09.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named09.conf.j2 @@ -1,4 +1,4 @@ -acl accept { 10.53.0.2; }; +acl accept { @ns.ip@; }; options { {% include_indented "_common/options.conf.j2" %} diff --git a/bin/tests/system/allow_query/ns2/named24.conf.j2 b/bin/tests/system/allow_query/ns2/named24.conf.j2 index c7e418c24b2..dabfa010a3b 100644 --- a/bin/tests/system/allow_query/ns2/named24.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named24.conf.j2 @@ -8,7 +8,7 @@ options { view "internal" { - allow-query { 10.53.0.2; }; + allow-query { @ns.ip@; }; {% include_indented "_common/root.hint.conf" %} diff --git a/bin/tests/system/allow_query/ns2/named26.conf.j2 b/bin/tests/system/allow_query/ns2/named26.conf.j2 index 8a10c2e13ba..bcf3569e2c9 100644 --- a/bin/tests/system/allow_query/ns2/named26.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named26.conf.j2 @@ -8,7 +8,7 @@ options { view "internal" { - allow-query {! 10.53.0.2; }; + allow-query {! @ns.ip@; }; {% include_indented "_common/root.hint.conf" %} diff --git a/bin/tests/system/allow_query/ns2/named27.conf.j2 b/bin/tests/system/allow_query/ns2/named27.conf.j2 index e70e013882a..2aa191fd837 100644 --- a/bin/tests/system/allow_query/ns2/named27.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named27.conf.j2 @@ -1,4 +1,4 @@ -acl accept { 10.53.0.2; }; +acl accept { @ns.ip@; }; options { {% include_indented "_common/options.conf.j2" %} diff --git a/bin/tests/system/allow_query/ns2/named29.conf.j2 b/bin/tests/system/allow_query/ns2/named29.conf.j2 index a12fc1eb5b9..d172059b4f2 100644 --- a/bin/tests/system/allow_query/ns2/named29.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named29.conf.j2 @@ -1,4 +1,4 @@ -acl accept { 10.53.0.2; }; +acl accept { @ns.ip@; }; options { {% include_indented "_common/options.conf.j2" %} diff --git a/bin/tests/system/allow_query/ns2/named40.conf.j2 b/bin/tests/system/allow_query/ns2/named40.conf.j2 index 57fb02875b2..4e161a757ed 100644 --- a/bin/tests/system/allow_query/ns2/named40.conf.j2 +++ b/bin/tests/system/allow_query/ns2/named40.conf.j2 @@ -1,4 +1,4 @@ -acl accept { 10.53.0.2; }; +acl accept { @ns.ip@; }; acl badaccept { 10.53.0.1; }; @@ -42,7 +42,7 @@ zone "none.example" { zone "addrallow.example" { type primary; file "generic.db"; - allow-query { 10.53.0.2; }; + allow-query { @ns.ip@; }; }; zone "addrnotallow.example" { @@ -54,7 +54,7 @@ zone "addrnotallow.example" { zone "addrdisallow.example" { type primary; file "generic.db"; - allow-query { ! 10.53.0.2; }; + allow-query { ! @ns.ip@; }; }; zone "aclallow.example" { diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2 index f56bb62e854..cccb27a7910 100644 --- a/bin/tests/system/allow_query/ns3/named2.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named2.conf.j2 @@ -2,7 +2,7 @@ options { {% include_indented "_common/options.conf.j2" %} allow-recursion { any; }; allow-recursion-on { none; }; - allow-query-cache-on { 10.53.0.3; }; + allow-query-cache-on { @ns.ip@; }; dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2 index cc9f2434861..529a5695816 100644 --- a/bin/tests/system/allow_query/ns3/named3.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named3.conf.j2 @@ -1,11 +1,11 @@ options { {% 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 { @ns.ip@; 10.53.1.2; }; listen-on-v6 { none; }; allow-recursion { any; }; allow-query-cache { any; }; - allow-query-cache-on { 10.53.0.3; }; # allow-recursion-on inherits + allow-query-cache-on { @ns.ip@; }; # allow-recursion-on inherits dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2 index 2771591dac9..29db14adef4 100644 --- a/bin/tests/system/allow_query/ns3/named4.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named4.conf.j2 @@ -1,11 +1,11 @@ options { {% 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 { @ns.ip@; 10.53.1.2; }; listen-on-v6 { none; }; allow-recursion { any; }; allow-query-cache { any; }; - allow-recursion-on { 10.53.0.3; }; # allow-query-cache-on inherits + allow-recursion-on { @ns.ip@; }; # allow-query-cache-on inherits dnssec-validation no; }; diff --git a/bin/tests/system/allow_query/ns3/named5.conf.j2 b/bin/tests/system/allow_query/ns3/named5.conf.j2 index 0b21fa28cd0..396f10672d1 100644 --- a/bin/tests/system/allow_query/ns3/named5.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named5.conf.j2 @@ -1,7 +1,7 @@ options { {% 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 { @ns.ip@; 10.53.1.2; }; listen-on-v6 { none; }; recursion no; allow-recursion { none; }; @@ -11,7 +11,7 @@ options { {% include "_common/controls.conf.j2" %} view internal { - match-destinations { 10.53.0.3; }; + match-destinations { @ns.ip@; }; {% include_indented "_common/root.hint.conf" %} recursion yes; diff --git a/bin/tests/system/allow_query/ns3/named6.conf.j2 b/bin/tests/system/allow_query/ns3/named6.conf.j2 index 723c58430e7..a25f076c885 100644 --- a/bin/tests/system/allow_query/ns3/named6.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named6.conf.j2 @@ -8,7 +8,7 @@ options { {% include "_common/controls.conf.j2" %} view internal { - match-destinations { 10.53.0.3; }; + match-destinations { @ns.ip@; }; {% include_indented "_common/root.hint.conf" %} recursion yes; allow-recursion{ any; }; diff --git a/bin/tests/system/allow_query/ns3/named7.conf.j2 b/bin/tests/system/allow_query/ns3/named7.conf.j2 index dd5846cdfd0..569a3a72de8 100644 --- a/bin/tests/system/allow_query/ns3/named7.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named7.conf.j2 @@ -8,7 +8,7 @@ options { {% include "_common/controls.conf.j2" %} view internal { - match-destinations { 10.53.0.3; }; + match-destinations { @ns.ip@; }; {% include_indented "_common/root.hint.conf" %} recursion yes; allow-query{ any; }; diff --git a/bin/tests/system/allow_query/ns3/named8.conf.j2 b/bin/tests/system/allow_query/ns3/named8.conf.j2 index 9f1ddbb6ed5..374bb7b025c 100644 --- a/bin/tests/system/allow_query/ns3/named8.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named8.conf.j2 @@ -1,7 +1,7 @@ options { {% 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 { @ns.ip@; 10.53.0.4; 10.53.1.2; }; listen-on-v6 { none; }; recursion no; allow-query-cache { none; }; @@ -14,6 +14,6 @@ view internal { {% include_indented "_common/root.hint.conf" %} recursion yes; - allow-query-cache { 10.53.0.3; 10.53.0.4; }; + allow-query-cache { @ns.ip@; 10.53.0.4; }; allow-query { 10.53.0.4; }; }; diff --git a/bin/tests/system/cache_delegns/ns2/named.conf.j2 b/bin/tests/system/cache_delegns/ns2/named.conf.j2 index 19e6972fa7e..a85c30393be 100644 --- a/bin/tests/system/cache_delegns/ns2/named.conf.j2 +++ b/bin/tests/system/cache_delegns/ns2/named.conf.j2 @@ -8,20 +8,20 @@ options { {% if disablev4 %} query-source address none; {% else %} - query-source address 10.53.0.2; + query-source address @ns.ip@; {% endif %} {% if disablev6 %} query-source-v6 none; {% else %} - query-source-v6 address fd92:7065:b8e:ffff::2; + query-source-v6 address @ns.ip6@; {% endif %} - notify-source 10.53.0.2; - transfer-source 10.53.0.2; + notify-source @ns.ip@; + transfer-source @ns.ip@; - notify-source-v6 fd92:7065:b8e:ffff::2; - transfer-source-v6 fd92:7065:b8e:ffff::2; + notify-source-v6 @ns.ip6@; + transfer-source-v6 @ns.ip6@; dnssec-validation no; diff --git a/bin/tests/system/case/ns2/named.conf.j2 b/bin/tests/system/case/ns2/named.conf.j2 index 1b135685972..cb3b78ca551 100644 --- a/bin/tests/system/case/ns2/named.conf.j2 +++ b/bin/tests/system/case/ns2/named.conf.j2 @@ -4,7 +4,7 @@ options { recursion no; ixfr-from-differences yes; check-integrity no; - no-case-compress { 10.53.0.2; }; + no-case-compress { @ns.ip@; }; minimal-responses no; dnssec-validation no; }; diff --git a/bin/tests/system/catz/ns1/named.conf.j2 b/bin/tests/system/catz/ns1/named.conf.j2 index 0c7d24855a1..da7593d06d7 100644 --- a/bin/tests/system/catz/ns1/named.conf.j2 +++ b/bin/tests/system/catz/ns1/named.conf.j2 @@ -4,8 +4,8 @@ options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; allow-new-zones yes; - listen-on port @EXTRAPORT1@ { 10.53.0.1; }; - listen-on tls ephemeral { 10.53.0.1; }; + listen-on port @EXTRAPORT1@ { @ns.ip@; }; + listen-on tls ephemeral { @ns.ip@; }; notify no; notify-delay 0; recursion no; diff --git a/bin/tests/system/catz/ns4/named.conf.j2 b/bin/tests/system/catz/ns4/named.conf.j2 index 2a2fb41213c..744be21c19b 100644 --- a/bin/tests/system/catz/ns4/named.conf.j2 +++ b/bin/tests/system/catz/ns4/named.conf.j2 @@ -20,7 +20,7 @@ options { default-primaries { 10.53.0.1 key tsig_key tls ephemeral; }; zone "catalog-self.example" min-update-interval 1s - default-primaries { 10.53.0.4; }; + default-primaries { @ns.ip@; }; }; }; diff --git a/bin/tests/system/checkds/ns10/named.conf.j2 b/bin/tests/system/checkds/ns10/named.conf.j2 index a8aae77dc53..396013aec21 100644 --- a/bin/tests/system/checkds/ns10/named.conf.j2 +++ b/bin/tests/system/checkds/ns10/named.conf.j2 @@ -11,54 +11,54 @@ options { zone "ns2" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2.db"; }; zone "ns2-4" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-4.db"; }; zone "ns2-4-5" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-4-5.db"; }; zone "ns2-4-6" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-4-6.db"; }; zone "ns2-5-7" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-5-7.db"; }; zone "ns5" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns5.db"; }; zone "ns5-6-7" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns5-6-7.db"; }; zone "ns5-7" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns5-7.db"; }; zone "ns6" { type secondary; - primaries source 10.53.0.10 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns6.db"; }; diff --git a/bin/tests/system/checkds/ns2/named.conf.j2 b/bin/tests/system/checkds/ns2/named.conf.j2 index f80ea59dc79..55429287295 100644 --- a/bin/tests/system/checkds/ns2/named.conf.j2 +++ b/bin/tests/system/checkds/ns2/named.conf.j2 @@ -14,7 +14,7 @@ options { zone "ns2" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns2.db"; @@ -23,7 +23,7 @@ zone "ns2" { zone "ns2-4" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns2-4.db"; @@ -32,7 +32,7 @@ zone "ns2-4" { zone "ns2-4-5" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns2-4-5.db"; @@ -41,7 +41,7 @@ zone "ns2-4-5" { zone "ns2-4-6" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns2-4-6.db"; @@ -50,7 +50,7 @@ zone "ns2-4-6" { zone "ns2-5-7" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns2-5-7.db"; @@ -59,7 +59,7 @@ zone "ns2-5-7" { zone "ns5" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns5.db"; @@ -68,7 +68,7 @@ zone "ns5" { zone "ns5-6-7" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns5-6-7.db"; @@ -77,7 +77,7 @@ zone "ns5-6-7" { zone "ns5-7" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns5-7.db"; @@ -86,7 +86,7 @@ zone "ns5-7" { zone "ns6" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.2; 10.53.0.4; 10.53.0.8; }; + allow-transfer { @ns.ip@; 10.53.0.4; 10.53.0.8; }; also-notify { 10.53.0.4; 10.53.0.8; }; dnssec-policy default; file "ns6.db"; diff --git a/bin/tests/system/checkds/ns4/named.conf.j2 b/bin/tests/system/checkds/ns4/named.conf.j2 index 963b1c0cf25..2bf92ef3896 100644 --- a/bin/tests/system/checkds/ns4/named.conf.j2 +++ b/bin/tests/system/checkds/ns4/named.conf.j2 @@ -11,54 +11,54 @@ options { zone "ns2" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2.db"; }; zone "ns2-4" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-4.db"; }; zone "ns2-4-5" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-4-5.db"; }; zone "ns2-4-6" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-4-6.db"; }; zone "ns2-5-7" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-5-7.db"; }; zone "ns5" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns5.db"; }; zone "ns5-6-7" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns5-6-7.db"; }; zone "ns5-7" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns5-7.db"; }; zone "ns6" { type secondary; - primaries source 10.53.0.4 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns6.db"; }; diff --git a/bin/tests/system/checkds/ns5/named.conf.j2 b/bin/tests/system/checkds/ns5/named.conf.j2 index 04f93514417..a22cfb91e59 100644 --- a/bin/tests/system/checkds/ns5/named.conf.j2 +++ b/bin/tests/system/checkds/ns5/named.conf.j2 @@ -14,7 +14,7 @@ options { zone "ns2" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns2.db"; @@ -23,7 +23,7 @@ zone "ns2" { zone "ns2-4" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns2-4.db"; @@ -32,7 +32,7 @@ zone "ns2-4" { zone "ns2-4-5" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns2-4-5.db"; @@ -41,7 +41,7 @@ zone "ns2-4-5" { zone "ns2-4-6" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns2-4-6.db"; @@ -50,7 +50,7 @@ zone "ns2-4-6" { zone "ns2-5-7" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns2-5-7.db"; @@ -59,7 +59,7 @@ zone "ns2-5-7" { zone "ns5" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns5.db"; @@ -68,7 +68,7 @@ zone "ns5" { zone "ns5-6-7" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns5-6-7.db"; @@ -77,7 +77,7 @@ zone "ns5-6-7" { zone "ns5-7" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns5-7.db"; @@ -86,7 +86,7 @@ zone "ns5-7" { zone "ns6" { type primary; allow-update { any; }; - allow-transfer { 10.53.0.5; 10.53.0.7; 10.53.0.10; }; + allow-transfer { @ns.ip@; 10.53.0.7; 10.53.0.10; }; also-notify { 10.53.0.7; 10.53.0.10; }; dnssec-policy default; file "ns6.db"; diff --git a/bin/tests/system/checkds/ns7/named.conf.j2 b/bin/tests/system/checkds/ns7/named.conf.j2 index c322d6651e2..fb7c7900776 100644 --- a/bin/tests/system/checkds/ns7/named.conf.j2 +++ b/bin/tests/system/checkds/ns7/named.conf.j2 @@ -11,54 +11,54 @@ options { zone "ns2" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2.db"; }; zone "ns2-4" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-4.db"; }; zone "ns2-4-5" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-4-5.db"; }; zone "ns2-4-6" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-4-6.db"; }; zone "ns2-5-7" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns2-5-7.db"; }; zone "ns5" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns5.db"; }; zone "ns5-6-7" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns5-6-7.db"; }; zone "ns5-7" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns5-7.db"; }; zone "ns6" { type secondary; - primaries source 10.53.0.7 { 10.53.0.5 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.5 port @PORT@; }; file "ns6.db"; }; diff --git a/bin/tests/system/checkds/ns8/named.conf.j2 b/bin/tests/system/checkds/ns8/named.conf.j2 index a1d9b817abb..6ad6c8b4507 100644 --- a/bin/tests/system/checkds/ns8/named.conf.j2 +++ b/bin/tests/system/checkds/ns8/named.conf.j2 @@ -11,54 +11,54 @@ options { zone "ns2" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2.db"; }; zone "ns2-4" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-4.db"; }; zone "ns2-4-5" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-4-5.db"; }; zone "ns2-4-6" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-4-6.db"; }; zone "ns2-5-7" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns2-5-7.db"; }; zone "ns5" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns5.db"; }; zone "ns5-6-7" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns5-6-7.db"; }; zone "ns5-7" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns5-7.db"; }; zone "ns6" { type secondary; - primaries source 10.53.0.8 { 10.53.0.2 port @PORT@; }; + primaries source @ns.ip@ { 10.53.0.2 port @PORT@; }; file "ns6.db"; }; diff --git a/bin/tests/system/cipher_suites/ns1/named.conf.j2 b/bin/tests/system/cipher_suites/ns1/named.conf.j2 index 8e92f2a7671..94d487f76ae 100644 --- a/bin/tests/system/cipher_suites/ns1/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns1/named.conf.j2 @@ -35,10 +35,10 @@ tls tls-pfs-chacha20 { options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls tls-perfect-forward-secrecy { 10.53.0.1; }; - listen-on port @EXTRAPORT1@ tls tls-pfs-aes128 { 10.53.0.1; }; - listen-on port @EXTRAPORT2@ tls tls-pfs-aes256 { 10.53.0.1; }; - listen-on port @EXTRAPORT3@ tls tls-pfs-chacha20 { 10.53.0.1; }; + listen-on tls tls-perfect-forward-secrecy { @ns.ip@; }; + listen-on port @EXTRAPORT1@ tls tls-pfs-aes128 { @ns.ip@; }; + listen-on port @EXTRAPORT2@ tls tls-pfs-aes256 { @ns.ip@; }; + listen-on port @EXTRAPORT3@ tls tls-pfs-chacha20 { @ns.ip@; }; recursion no; notify explicit; also-notify { 10.53.0.2 port @PORT@; }; diff --git a/bin/tests/system/cipher_suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2 index b479b75cf92..d3a285b1f37 100644 --- a/bin/tests/system/cipher_suites/ns2/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns2/named.conf.j2 @@ -8,7 +8,7 @@ tls local { options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls local { 10.53.0.2; }; // DoT + listen-on tls local { @ns.ip@; }; // DoT recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/cipher_suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2 index e46a2639ca4..3ab1a3229d0 100644 --- a/bin/tests/system/cipher_suites/ns3/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns3/named.conf.j2 @@ -8,7 +8,7 @@ tls local { options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls local { 10.53.0.3; }; // DoT + listen-on tls local { @ns.ip@; }; // DoT recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/cipher_suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2 index 343343601b2..3fe513fd967 100644 --- a/bin/tests/system/cipher_suites/ns4/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns4/named.conf.j2 @@ -8,7 +8,7 @@ tls local { options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls local { 10.53.0.4; }; // DoT + listen-on tls local { @ns.ip@; }; // DoT recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/cipher_suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2 index abc14908603..cede6ecf526 100644 --- a/bin/tests/system/cipher_suites/ns5/named.conf.j2 +++ b/bin/tests/system/cipher_suites/ns5/named.conf.j2 @@ -8,7 +8,7 @@ tls local { options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls local { 10.53.0.5; }; // DoT + listen-on tls local { @ns.ip@; }; // DoT recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 b/bin/tests/system/delegdb_flush/ns1/named.conf.j2 index b2ebb584016..e8ffd475d7e 100644 --- a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 +++ b/bin/tests/system/delegdb_flush/ns1/named.conf.j2 @@ -4,7 +4,7 @@ options { }; statistics-channels { - inet 10.53.0.1 port @EXTRAPORT1@; + inet @ns.ip@ port @EXTRAPORT1@; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.j2 b/bin/tests/system/dlzexternal/ns1/named.conf.j2 index c9272cef6ea..129246b6bfd 100644 --- a/bin/tests/system/dlzexternal/ns1/named.conf.j2 +++ b/bin/tests/system/dlzexternal/ns1/named.conf.j2 @@ -2,9 +2,9 @@ options { {% 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 { @ns.ip@; 127.0.0.1; }; listen-on-v6 { none; }; - allow-transfer { !10.53.0.1; any; }; + allow-transfer { !@ns.ip@; any; }; recursion no; dnssec-validation no; }; diff --git a/bin/tests/system/dns64/ns1/named.conf.j2 b/bin/tests/system/dns64/ns1/named.conf.j2 index 1078fa8864d..b4406f2fa18 100644 --- a/bin/tests/system/dns64/ns1/named.conf.j2 +++ b/bin/tests/system/dns64/ns1/named.conf.j2 @@ -6,7 +6,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { {% include_indented "_common/options.conf.j2" %} - allow-recursion { 10.53.0.1; }; + allow-recursion { @ns.ip@; }; dnssec-validation no; dns64 2001:bbbb::/96 { diff --git a/bin/tests/system/dns64/ns1/named2.conf.j2 b/bin/tests/system/dns64/ns1/named2.conf.j2 index 2009ae965cf..c38eca62640 100644 --- a/bin/tests/system/dns64/ns1/named2.conf.j2 +++ b/bin/tests/system/dns64/ns1/named2.conf.j2 @@ -6,7 +6,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { {% include_indented "_common/options.conf.j2" %} - allow-recursion { 10.53.0.1; }; + allow-recursion { @ns.ip@; }; dnssec-validation no; dns64 2001:bbbb::/96 { diff --git a/bin/tests/system/dns64/ns1/named3.conf.j2 b/bin/tests/system/dns64/ns1/named3.conf.j2 index aab22dcd94d..3fc306c2b5b 100644 --- a/bin/tests/system/dns64/ns1/named3.conf.j2 +++ b/bin/tests/system/dns64/ns1/named3.conf.j2 @@ -6,7 +6,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { {% include_indented "_common/options.conf.j2" %} - allow-recursion { 10.53.0.1; }; + allow-recursion { @ns.ip@; }; dnssec-validation no; }; diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2 index d8c3a4a76e6..5620442fdf9 100644 --- a/bin/tests/system/dns64/ns2/named.conf.j2 +++ b/bin/tests/system/dns64/ns2/named.conf.j2 @@ -7,7 +7,7 @@ options { dnssec-validation no; dns64 2001:aaaa::/96 { - clients { 10.53.0.2; }; + clients { @ns.ip@; }; mapped { !rfc1918; any; }; exclude { 2001:eeee::/32; 64:FF9B::/96; ::ffff:0000:0000/96; }; suffix ::; diff --git a/bin/tests/system/dns64/ns3/named.conf.j2 b/bin/tests/system/dns64/ns3/named.conf.j2 index c2c7ab7bb3f..63438818961 100644 --- a/bin/tests/system/dns64/ns3/named.conf.j2 +++ b/bin/tests/system/dns64/ns3/named.conf.j2 @@ -8,7 +8,7 @@ options { {% 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 port @PORT@ { @ns.ip@; }; // for start.pl 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 c16c43cc217..63f57da6b44 100644 --- a/bin/tests/system/dns64/ns4/named.conf.j2 +++ b/bin/tests/system/dns64/ns4/named.conf.j2 @@ -3,13 +3,13 @@ options { {% include_indented "_common/options/sources.conf.j2" %} - query-source-v6 address fd92:7065:b8e:fffe::10.53.0.4; - notify-source-v6 fd92:7065:b8e:fffe::10.53.0.4; - transfer-source-v6 fd92:7065:b8e:fffe::10.53.0.4; + query-source-v6 address fd92:7065:b8e:fffe::@ns.ip@; + notify-source-v6 fd92:7065:b8e:fffe::@ns.ip@; + transfer-source-v6 fd92:7065:b8e:fffe::@ns.ip@; port @EXTRAPORT1@; pid-file "named.pid"; - listen-on port @PORT@ { 10.53.0.4; }; // for start.pl - listen-on-v6 { fd92:7065:b8e:fffe::10.53.0.4; }; + listen-on port @PORT@ { @ns.ip@; }; // for start.pl + listen-on-v6 { fd92:7065:b8e:fffe::@ns.ip@; }; dnssec-validation no; recursion no; }; diff --git a/bin/tests/system/dnssec/ns4/named.conf.j2 b/bin/tests/system/dnssec/ns4/named.conf.j2 index 77b77b8cf31..bc755fb6bdc 100644 --- a/bin/tests/system/dnssec/ns4/named.conf.j2 +++ b/bin/tests/system/dnssec/ns4/named.conf.j2 @@ -48,12 +48,12 @@ include "trusted.conf"; zone secure.example { type static-stub; - server-addresses { 10.53.0.4; }; + server-addresses { @ns.ip@; }; }; zone insecure.secure.example { type static-stub; - server-addresses { 10.53.0.4; }; + server-addresses { @ns.ip@; }; }; }; diff --git a/bin/tests/system/dnssec/ns5/named.conf.j2 b/bin/tests/system/dnssec/ns5/named.conf.j2 index ae0c5891718..67aaf5d168a 100644 --- a/bin/tests/system/dnssec/ns5/named.conf.j2 +++ b/bin/tests/system/dnssec/ns5/named.conf.j2 @@ -6,7 +6,7 @@ options { {% 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 { @ns.ip@; 127.0.0.1; }; listen-on-v6 { none; }; minimal-any no; minimal-responses no; diff --git a/bin/tests/system/doth/ns1/named.conf.j2 b/bin/tests/system/doth/ns1/named.conf.j2 index cf2672bc7b4..3cbdcc2a977 100644 --- a/bin/tests/system/doth/ns1/named.conf.j2 +++ b/bin/tests/system/doth/ns1/named.conf.j2 @@ -56,20 +56,20 @@ options { tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - listen-on tls tls-forward-secrecy { 10.53.0.1; }; // DoT - listen-on-v6 tls tls-forward-secrecy { fd92:7065:b8e:ffff::1;}; - listen-on tls ephemeral http local { 10.53.0.1; }; // DoH - listen-on-v6 tls ephemeral http local { fd92:7065:b8e:ffff::1; }; - listen-on tls none http local { 10.53.0.1; }; // unencrypted DoH - listen-on-v6 tls none http local { fd92:7065:b8e:ffff::1; }; - listen-on port @EXTRAPORT1@ tls tls-pfs-aes256 { 10.53.0.1; }; // DoT - listen-on-v6 port @EXTRAPORT1@ tls tls-pfs-aes256 { fd92:7065:b8e:ffff::1;}; - listen-on port @EXTRAPORT2@ tls tls-no-subject-alt-name { 10.53.0.1; }; // DoT - listen-on port @EXTRAPORT3@ tls tls-no-subject-alt-name http local { 10.53.0.1; }; // DoH - listen-on port @EXTRAPORT4@ tls tls-expired { 10.53.0.1; }; // DoT - listen-on port @EXTRAPORT5@ tls tls-forward-secrecy-mutual-tls { 10.53.0.1; }; // DoT - listen-on port @EXTRAPORT6@ tls tls-forward-secrecy-mutual-tls http local { 10.53.0.1; }; // DoH - listen-on port @EXTRAPORT7@ tls tls-forward-secrecy { 10.53.0.1; }; // DoT + listen-on tls tls-forward-secrecy { @ns.ip@; }; // DoT + listen-on-v6 tls tls-forward-secrecy { @ns.ip6@;}; + listen-on tls ephemeral http local { @ns.ip@; }; // DoH + listen-on-v6 tls ephemeral http local { @ns.ip6@; }; + listen-on tls none http local { @ns.ip@; }; // unencrypted DoH + listen-on-v6 tls none http local { @ns.ip6@; }; + listen-on port @EXTRAPORT1@ tls tls-pfs-aes256 { @ns.ip@; }; // DoT + listen-on-v6 port @EXTRAPORT1@ tls tls-pfs-aes256 { @ns.ip6@;}; + listen-on port @EXTRAPORT2@ tls tls-no-subject-alt-name { @ns.ip@; }; // DoT + listen-on port @EXTRAPORT3@ tls tls-no-subject-alt-name http local { @ns.ip@; }; // DoH + listen-on port @EXTRAPORT4@ tls tls-expired { @ns.ip@; }; // DoT + listen-on port @EXTRAPORT5@ tls tls-forward-secrecy-mutual-tls { @ns.ip@; }; // DoT + listen-on port @EXTRAPORT6@ tls tls-forward-secrecy-mutual-tls http local { @ns.ip@; }; // DoH + listen-on port @EXTRAPORT7@ tls tls-forward-secrecy { @ns.ip@; }; // DoT recursion no; notify explicit; also-notify { 10.53.0.2 port @PORT@; }; diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2 index d18f818500f..090a45765e7 100644 --- a/bin/tests/system/doth/ns2/named.conf.j2 +++ b/bin/tests/system/doth/ns2/named.conf.j2 @@ -15,15 +15,15 @@ options { tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - listen-on tls local { 10.53.0.2; }; // DoT - listen-on-v6 tls local { fd92:7065:b8e:ffff::2; }; - listen-on tls local http local { 10.53.0.2; }; // DoH - listen-on-v6 tls local http local { fd92:7065:b8e:ffff::2; }; - listen-on tls none http local { 10.53.0.2; }; // unencrypted DoH - listen-on-v6 tls none http local { fd92:7065:b8e:ffff::2; }; + listen-on tls local { @ns.ip@; }; // DoT + listen-on-v6 tls local { @ns.ip6@; }; + listen-on tls local http local { @ns.ip@; }; // DoH + listen-on-v6 tls local http local { @ns.ip6@; }; + listen-on tls none http local { @ns.ip@; }; // unencrypted DoH + listen-on-v6 tls none http local { @ns.ip6@; }; allow-recursion { any; }; allow-query-cache { any; }; - allow-recursion-on { 10.53.0.2; }; # allow-query-cache-on inherits; + allow-recursion-on { @ns.ip@; }; # allow-query-cache-on inherits; notify no; ixfr-from-differences yes; check-integrity no; @@ -44,7 +44,7 @@ tls tls-example-primary-wrong-ca { zone "test.example.com" { type forward; forward only; - forwarders port @TLSPORT@ { 10.53.0.2 tls tls-example-primary-wrong-ca; }; + forwarders port @TLSPORT@ { @ns.ip@ tls tls-example-primary-wrong-ca; }; }; tls tls-example-primary { diff --git a/bin/tests/system/doth/ns3/named.conf.j2 b/bin/tests/system/doth/ns3/named.conf.j2 index 93f1a192302..bf7b2df8afa 100644 --- a/bin/tests/system/doth/ns3/named.conf.j2 +++ b/bin/tests/system/doth/ns3/named.conf.j2 @@ -15,7 +15,7 @@ options { tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - listen-on tls local { 10.53.0.3; }; // DoT + listen-on tls local { @ns.ip@; }; // DoT recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/doth/ns4/named.conf.j2 b/bin/tests/system/doth/ns4/named.conf.j2 index 72cad042ea6..f8b91948694 100644 --- a/bin/tests/system/doth/ns4/named.conf.j2 +++ b/bin/tests/system/doth/ns4/named.conf.j2 @@ -22,8 +22,8 @@ options { tls-port @TLSPORT@; https-port @HTTPSPORT@; http-port @HTTPPORT@; - listen-on tls local { 10.53.0.4; }; // DoT - listen-on tls local http local { 10.53.0.4; }; // DoH + listen-on tls local { @ns.ip@; }; // DoT + listen-on tls local http local { @ns.ip@; }; // DoH recursion no; notify no; ixfr-from-differences yes; diff --git a/bin/tests/system/dyndb/ns1/named.conf.j2 b/bin/tests/system/dyndb/ns1/named.conf.j2 index 9e56bca3cf3..1f2176a13fc 100644 --- a/bin/tests/system/dyndb/ns1/named.conf.j2 +++ b/bin/tests/system/dyndb/ns1/named.conf.j2 @@ -2,7 +2,7 @@ options { {% 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 { @ns.ip@; 127.0.0.1; }; listen-on-v6 { none; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/filters/ns1/named.conf.j2 b/bin/tests/system/filters/ns1/named.conf.j2 index c15d9956038..0a44c4682c3 100644 --- a/bin/tests/system/filters/ns1/named.conf.j2 +++ b/bin/tests/system/filters/ns1/named.conf.j2 @@ -11,10 +11,10 @@ options { {% if family == "v6" %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v6 yes; - filter-@filtertype@ { fd92:7065:b8e:ffff::1; }; + filter-@filtertype@ { @ns.ip6@; }; }; {% else %} - acl filterees { 10.53.0.1; }; + acl filterees { @ns.ip@; }; plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v4 yes; diff --git a/bin/tests/system/filters/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 index 3f877c2f835..d67a6f4e3a5 100644 --- a/bin/tests/system/filters/ns2/named.conf.j2 +++ b/bin/tests/system/filters/ns2/named.conf.j2 @@ -10,12 +10,12 @@ options { {% if family == "v6" %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v6 yes; - filter-@filtertype@ { fd92:7065:b8e:ffff::2; }; + filter-@filtertype@ { @ns.ip6@; }; }; {% else %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v4 yes; - filter-@filtertype@ { 10.53.0.2; }; + filter-@filtertype@ { @ns.ip@; }; }; {% endif %} diff --git a/bin/tests/system/filters/ns3/named.conf.j2 b/bin/tests/system/filters/ns3/named.conf.j2 index a4b95797783..4a619f72b5e 100644 --- a/bin/tests/system/filters/ns3/named.conf.j2 +++ b/bin/tests/system/filters/ns3/named.conf.j2 @@ -10,12 +10,12 @@ options { {% if family == "v6" %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v6 break-dnssec; - filter-@filtertype@ { fd92:7065:b8e:ffff::3; }; + filter-@filtertype@ { @ns.ip6@; }; }; {% else %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v4 break-dnssec; - filter-@filtertype@ { 10.53.0.3; }; + filter-@filtertype@ { @ns.ip@; }; }; {% endif %} diff --git a/bin/tests/system/filters/ns4/named.conf.j2 b/bin/tests/system/filters/ns4/named.conf.j2 index 86ca2e9ad85..b73c3a25363 100644 --- a/bin/tests/system/filters/ns4/named.conf.j2 +++ b/bin/tests/system/filters/ns4/named.conf.j2 @@ -11,12 +11,12 @@ options { {% if family == "v6" %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v6 break-dnssec; - filter-@filtertype@ { fd92:7065:b8e:ffff::4; }; + filter-@filtertype@ { @ns.ip6@; }; }; {% else %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v4 break-dnssec; - filter-@filtertype@ { 10.53.0.4; }; + filter-@filtertype@ { @ns.ip@; }; }; {% endif %} @@ -30,12 +30,12 @@ zone "signed" { {% if family == "v6" %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v6 break-dnssec; - filter-@filtertype@ { fd92:7065:b8e:ffff::4; }; + filter-@filtertype@ { @ns.ip6@; }; }; {% else %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v4 break-dnssec; - filter-@filtertype@ { 10.53.0.4; }; + filter-@filtertype@ { @ns.ip@; }; }; {% endif %} }; @@ -46,12 +46,12 @@ zone "unsigned" { {% if family == "v6" %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v6 break-dnssec; - filter-@filtertype@ { fd92:7065:b8e:ffff::4; }; + filter-@filtertype@ { @ns.ip6@; }; }; {% else %} plugin query "@TOP_BUILDDIR@/filter-@filtertype@.@DYLIB@" { filter-@filtertype@-on-v4 break-dnssec; - filter-@filtertype@ { 10.53.0.4; }; + filter-@filtertype@ { @ns.ip@; }; }; {% endif %} }; diff --git a/bin/tests/system/forward/ns2/named.conf.j2 b/bin/tests/system/forward/ns2/named.conf.j2 index e7377e748ee..bb262f210bc 100644 --- a/bin/tests/system/forward/ns2/named.conf.j2 +++ b/bin/tests/system/forward/ns2/named.conf.j2 @@ -9,10 +9,10 @@ options { {% if FEATURE_FIPS_DH == "1" %} tls-port @TLSPORT@; - listen-on tls ephemeral { 10.53.0.2; }; - listen-on port @EXTRAPORT1@ tls tls-forward-secrecy { 10.53.0.2; }; - listen-on port @EXTRAPORT2@ tls tls-forward-secrecy-mutual-tls { 10.53.0.2; }; - listen-on port @EXTRAPORT3@ tls tls-expired { 10.53.0.2; }; + listen-on tls ephemeral { @ns.ip@; }; + listen-on port @EXTRAPORT1@ tls tls-forward-secrecy { @ns.ip@; }; + listen-on port @EXTRAPORT2@ tls tls-forward-secrecy-mutual-tls { @ns.ip@; }; + listen-on port @EXTRAPORT3@ tls tls-expired { @ns.ip@; }; {% endif %} }; diff --git a/bin/tests/system/forward/ns4/named.conf.j2 b/bin/tests/system/forward/ns4/named.conf.j2 index 071e4187fef..9879472f45d 100644 --- a/bin/tests/system/forward/ns4/named.conf.j2 +++ b/bin/tests/system/forward/ns4/named.conf.j2 @@ -16,7 +16,7 @@ options { {% include "_common/controls.conf.j2" %} {% if FEATURE_JSON_C == "1" %} -statistics-channels { inet 10.53.0.4 port @EXTRAPORT1@ allow { localhost; }; }; +statistics-channels { inet @ns.ip@ port @EXTRAPORT1@ allow { localhost; }; }; {% endif %} zone "." { diff --git a/bin/tests/system/geoip2/ns2/named2.conf.j2 b/bin/tests/system/geoip2/ns2/named2.conf.j2 index a88ae5b062b..3edd9121ad8 100644 --- a/bin/tests/system/geoip2/ns2/named2.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named2.conf.j2 @@ -3,8 +3,8 @@ options { {% 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; }; + listen-on { 127.0.0.1; @ns.ip@; }; + listen-on-v6 { ::1; @ns.ip6@; }; recursion no; dnssec-validation no; geoip-directory "../data"; diff --git a/bin/tests/system/inline/ns3/named.conf.j2 b/bin/tests/system/inline/ns3/named.conf.j2 index 5828f5baa75..6bf6066e471 100644 --- a/bin/tests/system/inline/ns3/named.conf.j2 +++ b/bin/tests/system/inline/ns3/named.conf.j2 @@ -73,7 +73,7 @@ zone "primary" { file "primary.db"; notify explicit; also-notify { - 10.53.0.3; + @ns.ip@; }; }; diff --git a/bin/tests/system/names/ns1/named.conf.j2 b/bin/tests/system/names/ns1/named.conf.j2 index 94a29055d85..7129d04e1db 100644 --- a/bin/tests/system/names/ns1/named.conf.j2 +++ b/bin/tests/system/names/ns1/named.conf.j2 @@ -9,7 +9,7 @@ options { {% include "_common/controls.conf.j2" %} view compress { - match-clients { 10.53.0.1/32; }; + match-clients { @ns.ip@/32; }; zone "example" { type primary; file "example.db"; diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2 index 28835ed95d0..49682264656 100644 --- a/bin/tests/system/notify/ns2/named.conf.j2 +++ b/bin/tests/system/notify/ns2/named.conf.j2 @@ -4,7 +4,7 @@ include "named-tls.conf"; options { {% include_indented "_common/options.conf.j2" %} - notify-source-v6 fd92:7065:b8e:ffff::2; + notify-source-v6 @ns.ip6@; allow-transfer { any; }; recursion no; startup-notify-rate 5; @@ -12,10 +12,10 @@ options { {% if FEATURE_FIPS_DH == "1" %} tls-port @TLSPORT@; - listen-on tls ephemeral { 10.53.0.2; }; - listen-on port @EXTRAPORT1@ tls tls-forward-secrecy { 10.53.0.2; }; - listen-on port @EXTRAPORT3@ tls tls-forward-secrecy-mutual-tls { 10.53.0.2; }; - listen-on port @EXTRAPORT4@ tls tls-expired { 10.53.0.2; }; + listen-on tls ephemeral { @ns.ip@; }; + listen-on port @EXTRAPORT1@ tls tls-forward-secrecy { @ns.ip@; }; + listen-on port @EXTRAPORT3@ tls tls-forward-secrecy-mutual-tls { @ns.ip@; }; + listen-on port @EXTRAPORT4@ tls tls-expired { @ns.ip@; }; {% endif %} }; @@ -38,7 +38,7 @@ zone x1 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; - notify-source 10.53.0.2; + notify-source @ns.ip@; notify primary-only; }; zone x2 { diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2 index 7704e467512..a7911290724 100644 --- a/bin/tests/system/notify/ns3/named.conf.j2 +++ b/bin/tests/system/notify/ns3/named.conf.j2 @@ -29,5 +29,5 @@ zone "example" { zone "notify-source-port-test" { type primary; file "notify-source-port-test.db"; - notify-source 10.53.0.3; + notify-source @ns.ip@; }; diff --git a/bin/tests/system/notify/ns5/named.conf.j2 b/bin/tests/system/notify/ns5/named.conf.j2 index a11ac03855f..0b90ef94a0c 100644 --- a/bin/tests/system/notify/ns5/named.conf.j2 +++ b/bin/tests/system/notify/ns5/named.conf.j2 @@ -25,7 +25,7 @@ view "a" { match-clients { key "a"; }; zone "x21" { type primary; - also-notify { 10.53.0.5 key "b"; 10.53.0.5 key "c"; }; + also-notify { @ns.ip@ key "b"; @ns.ip@ key "c"; }; file "x21.db"; allow-update { any; }; }; @@ -35,7 +35,7 @@ view "b" { match-clients { key "b"; }; zone "x21" { type secondary; - primaries { 10.53.0.5 key "a"; }; + primaries { @ns.ip@ key "a"; }; file "x21.bk-b"; notify no; }; @@ -45,7 +45,7 @@ view "c" { match-clients { key "c"; }; zone "x21" { type secondary; - primaries { 10.53.0.5 key "a"; }; + primaries { @ns.ip@ key "a"; }; file "x21.bk-c"; notify no; }; diff --git a/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2 index b143c3fb5f2..4972a1524dd 100644 --- a/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns2/named.conf.j2 @@ -15,7 +15,7 @@ options { {% include_indented "_common/options/sources.conf.j2" %} {% include_indented "_common/options/server.conf.j2" %} listen-on { - 10.53.0.2; + @ns.ip@; 10.53.0.5; 10.53.0.6; 10.53.0.7; diff --git a/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2 index 4911ada4fc1..5509ba2697b 100644 --- a/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns3/named.conf.j2 @@ -15,7 +15,7 @@ options { {% include_indented "_common/options/sources.conf.j2" %} {% include_indented "_common/options/server.conf.j2" %} listen-on { - 10.53.0.3; + @ns.ip@; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/nsupdate/ns1/named.conf.j2 b/bin/tests/system/nsupdate/ns1/named.conf.j2 index fe29079a097..d9c5e9e548a 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns1/named.conf.j2 @@ -6,7 +6,7 @@ options { {% 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 { @ns.ip@; 127.0.0.1; }; listen-on-v6 { none; }; recursion no; minimal-responses no; @@ -15,10 +15,10 @@ options { {% if FEATURE_FIPS_DH == "1" %} tls-port @TLSPORT@; - listen-on tls ephemeral { 10.53.0.1; }; - listen-on port @EXTRAPORT1@ tls tls-forward-secrecy { 10.53.0.1; }; - listen-on port @EXTRAPORT2@ tls tls-forward-secrecy-mutual-tls { 10.53.0.1; }; - listen-on port @EXTRAPORT3@ tls tls-expired { 10.53.0.1; }; + listen-on tls ephemeral { @ns.ip@; }; + listen-on port @EXTRAPORT1@ tls tls-forward-secrecy { @ns.ip@; }; + listen-on port @EXTRAPORT2@ tls tls-forward-secrecy-mutual-tls { @ns.ip@; }; + listen-on port @EXTRAPORT3@ tls tls-expired { @ns.ip@; }; {% endif %} }; @@ -76,7 +76,7 @@ zone "other.nil" { check-mx warn; update-policy local; allow-query { !10.53.0.2; any; }; - allow-query-on { 10.53.0.1; 127.0.0.1; }; + allow-query-on { @ns.ip@; 127.0.0.1; }; allow-transfer { any; }; }; diff --git a/bin/tests/system/nsupdate/ns10/named.conf.j2 b/bin/tests/system/nsupdate/ns10/named.conf.j2 index 1d870364acd..323a7197696 100644 --- a/bin/tests/system/nsupdate/ns10/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns10/named.conf.j2 @@ -2,7 +2,7 @@ options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; session-keyfile "session.key"; - listen-on tls ephemeral { 10.53.0.10; }; + listen-on tls ephemeral { @ns.ip@; }; recursion no; minimal-responses no; dnssec-validation no; diff --git a/bin/tests/system/proxy/ns1/named.conf.j2 b/bin/tests/system/proxy/ns1/named.conf.j2 index fed49b469f8..b1b99f01596 100644 --- a/bin/tests/system/proxy/ns1/named.conf.j2 +++ b/bin/tests/system/proxy/ns1/named.conf.j2 @@ -10,26 +10,26 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic test - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; - listen-on port @EXTRAPORT1@ proxy plain { 10.53.0.1; }; + listen-on port @EXTRAPORT1@ proxy plain { @ns.ip@; }; listen-on port @EXTRAPORT1@ proxy plain { 10.53.0.2; }; - listen-on port @TLSPORT@ proxy encrypted tls self-signed { 10.53.0.1; }; - listen-on port @EXTRAPORT2@ proxy plain tls self-signed { 10.53.0.1; }; - listen-on port @HTTPSPORT@ proxy encrypted tls self-signed http default { 10.53.0.1; }; - listen-on port @EXTRAPORT3@ proxy plain tls self-signed http default { 10.53.0.1; }; - listen-on port @HTTPPORT@ proxy plain tls none http default { 10.53.0.1; }; + listen-on port @TLSPORT@ proxy encrypted tls self-signed { @ns.ip@; }; + listen-on port @EXTRAPORT2@ proxy plain tls self-signed { @ns.ip@; }; + listen-on port @HTTPSPORT@ proxy encrypted tls self-signed http default { @ns.ip@; }; + listen-on port @EXTRAPORT3@ proxy plain tls self-signed http default { @ns.ip@; }; + listen-on port @HTTPPORT@ proxy plain tls none http default { @ns.ip@; }; - listen-on-v6 port @EXTRAPORT1@ proxy plain { fd92:7065:b8e:ffff::1; }; + listen-on-v6 port @EXTRAPORT1@ proxy plain { @ns.ip6@; }; listen-on-v6 port @EXTRAPORT1@ proxy plain { fd92:7065:b8e:ffff::2; }; - listen-on-v6 port @TLSPORT@ proxy encrypted tls self-signed { fd92:7065:b8e:ffff::1; }; - listen-on-v6 port @EXTRAPORT2@ proxy plain tls self-signed { fd92:7065:b8e:ffff::1; }; - listen-on-v6 port @HTTPSPORT@ proxy encrypted tls self-signed http default { fd92:7065:b8e:ffff::1; }; - listen-on-v6 port @EXTRAPORT3@ proxy plain tls self-signed http default { fd92:7065:b8e:ffff::1; }; - listen-on-v6 port @HTTPPORT@ proxy plain tls none http default { fd92:7065:b8e:ffff::1; }; + listen-on-v6 port @TLSPORT@ proxy encrypted tls self-signed { @ns.ip6@; }; + listen-on-v6 port @EXTRAPORT2@ proxy plain tls self-signed { @ns.ip6@; }; + listen-on-v6 port @HTTPSPORT@ proxy encrypted tls self-signed http default { @ns.ip6@; }; + listen-on-v6 port @EXTRAPORT3@ proxy plain tls self-signed http default { @ns.ip6@; }; + listen-on-v6 port @HTTPPORT@ proxy plain tls none http default { @ns.ip6@; }; allow-proxy { 10.53.0.10; fd92:7065:b8e:ffff::10; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; recursion no; notify explicit; @@ -57,7 +57,7 @@ zone "example2" { file "example.db"; # allow the real addresses only so that we can test LOCAL requests allow-query { 10.53.0.10; fd92:7065:b8e:ffff::10; }; - allow-query-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-query-on { @ns.ip@; @ns.ip6@; }; }; # Let's define some zones that will help us verify that ports diff --git a/bin/tests/system/proxy/ns3/named.conf.j2 b/bin/tests/system/proxy/ns3/named.conf.j2 index bbb476fc535..98535c735d6 100644 --- a/bin/tests/system/proxy/ns3/named.conf.j2 +++ b/bin/tests/system/proxy/ns3/named.conf.j2 @@ -10,21 +10,21 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic test - listen-on { 10.53.0.3; }; + listen-on { @ns.ip@; }; - listen-on port @EXTRAPORT1@ proxy plain { 10.53.0.3; }; - listen-on port @TLSPORT@ proxy encrypted tls self-signed { 10.53.0.3; }; - listen-on port @EXTRAPORT2@ proxy plain tls self-signed { 10.53.0.3; }; - listen-on port @HTTPSPORT@ proxy encrypted tls self-signed http default { 10.53.0.3; }; - listen-on port @EXTRAPORT3@ proxy plain tls self-signed http default { 10.53.0.3; }; - listen-on port @HTTPPORT@ proxy plain tls none http default { 10.53.0.3; }; + listen-on port @EXTRAPORT1@ proxy plain { @ns.ip@; }; + listen-on port @TLSPORT@ proxy encrypted tls self-signed { @ns.ip@; }; + listen-on port @EXTRAPORT2@ proxy plain tls self-signed { @ns.ip@; }; + listen-on port @HTTPSPORT@ proxy encrypted tls self-signed http default { @ns.ip@; }; + listen-on port @EXTRAPORT3@ proxy plain tls self-signed http default { @ns.ip@; }; + listen-on port @HTTPPORT@ proxy plain tls none http default { @ns.ip@; }; - listen-on-v6 port @EXTRAPORT1@ proxy plain { fd92:7065:b8e:ffff::3; }; - listen-on-v6 port @TLSPORT@ proxy encrypted tls self-signed { fd92:7065:b8e:ffff::3; }; - listen-on-v6 port @EXTRAPORT2@ proxy plain tls self-signed { fd92:7065:b8e:ffff::3; }; - listen-on-v6 port @HTTPSPORT@ proxy encrypted tls self-signed http default { fd92:7065:b8e:ffff::3; }; - listen-on-v6 port @EXTRAPORT3@ proxy plain tls self-signed http default { fd92:7065:b8e:ffff::3; }; - listen-on-v6 port @HTTPPORT@ proxy plain tls none http default { fd92:7065:b8e:ffff::3; }; + listen-on-v6 port @EXTRAPORT1@ proxy plain { @ns.ip6@; }; + listen-on-v6 port @TLSPORT@ proxy encrypted tls self-signed { @ns.ip6@; }; + listen-on-v6 port @EXTRAPORT2@ proxy plain tls self-signed { @ns.ip6@; }; + listen-on-v6 port @HTTPSPORT@ proxy encrypted tls self-signed http default { @ns.ip6@; }; + listen-on-v6 port @EXTRAPORT3@ proxy plain tls self-signed http default { @ns.ip6@; }; + listen-on-v6 port @HTTPPORT@ proxy plain tls none http default { @ns.ip6@; }; recursion no; notify explicit; diff --git a/bin/tests/system/query_source/ns1/named.conf.j2 b/bin/tests/system/query_source/ns1/named.conf.j2 index b835610b6e4..74ddbb8fc12 100644 --- a/bin/tests/system/query_source/ns1/named.conf.j2 +++ b/bin/tests/system/query_source/ns1/named.conf.j2 @@ -5,8 +5,8 @@ options { {% include_indented "_common/options/listen-dual.conf.j2" %} recursion no; dnssec-validation no; - query-source 10.53.0.1; - query-source-v6 fd92:7065:b8e:ffff::1; + query-source @ns.ip@; + query-source-v6 @ns.ip6@; }; zone "." { diff --git a/bin/tests/system/query_source/ns2/named.conf.j2 b/bin/tests/system/query_source/ns2/named.conf.j2 index 5141852e79e..fca6637dde6 100644 --- a/bin/tests/system/query_source/ns2/named.conf.j2 +++ b/bin/tests/system/query_source/ns2/named.conf.j2 @@ -5,7 +5,7 @@ options { {% include_indented "_common/options/listen-dual.conf.j2" %} dnssec-validation no; query-source none; - query-source-v6 fd92:7065:b8e:ffff::2; + query-source-v6 @ns.ip6@; }; zone "." { diff --git a/bin/tests/system/query_source/ns3/named.conf.j2 b/bin/tests/system/query_source/ns3/named.conf.j2 index 7a7f771f799..bb464d29ea2 100644 --- a/bin/tests/system/query_source/ns3/named.conf.j2 +++ b/bin/tests/system/query_source/ns3/named.conf.j2 @@ -5,7 +5,7 @@ options { {% include_indented "_common/options/listen-dual.conf.j2" %} dnssec-validation no; query-source-v6 none; - query-source 10.53.0.3; + query-source @ns.ip@; }; {% include "_common/root.hint.conf" %} diff --git a/bin/tests/system/query_source/ns4/named.conf.j2 b/bin/tests/system/query_source/ns4/named.conf.j2 index f14810c0186..cba05b73c4d 100644 --- a/bin/tests/system/query_source/ns4/named.conf.j2 +++ b/bin/tests/system/query_source/ns4/named.conf.j2 @@ -5,7 +5,7 @@ options { {% include_indented "_common/options/listen-dual.conf.j2" %} dnssec-validation no; query-source none; - query-source-v6 fd92:7065:b8e:ffff::4; + query-source-v6 @ns.ip6@; }; {% include "_common/root.hint.conf" %} diff --git a/bin/tests/system/query_source/ns5/named.conf.j2 b/bin/tests/system/query_source/ns5/named.conf.j2 index f2cc2053fd9..347eb29b000 100644 --- a/bin/tests/system/query_source/ns5/named.conf.j2 +++ b/bin/tests/system/query_source/ns5/named.conf.j2 @@ -4,7 +4,7 @@ options { {% 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 @ns.ip@; query-source-v6 none; }; diff --git a/bin/tests/system/redirect/ns1/named.conf.j2 b/bin/tests/system/redirect/ns1/named.conf.j2 index 4c214c8e2db..8c4e6807443 100644 --- a/bin/tests/system/redirect/ns1/named.conf.j2 +++ b/bin/tests/system/redirect/ns1/named.conf.j2 @@ -4,7 +4,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { {% include_indented "_common/options.conf.j2" %} - allow-recursion { 10.53.0.1; }; + allow-recursion { @ns.ip@; }; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns3/named.conf.j2 b/bin/tests/system/redirect/ns3/named.conf.j2 index 74d2ff1a0cc..afa888dfab3 100644 --- a/bin/tests/system/redirect/ns3/named.conf.j2 +++ b/bin/tests/system/redirect/ns3/named.conf.j2 @@ -2,7 +2,7 @@ acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { {% include_indented "_common/options.conf.j2" %} - allow-recursion { 10.53.0.3; }; + allow-recursion { @ns.ip@; }; dnssec-validation no; }; diff --git a/bin/tests/system/redirect/ns4/named.conf.j2 b/bin/tests/system/redirect/ns4/named.conf.j2 index ab7a9346c5f..dfaebed19a6 100644 --- a/bin/tests/system/redirect/ns4/named.conf.j2 +++ b/bin/tests/system/redirect/ns4/named.conf.j2 @@ -5,9 +5,9 @@ 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; + query-source address 10.53.0.2; /* note this is not @ns.ip@ */ + notify-source @ns.ip@; + transfer-source @ns.ip@; 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 6a1c91ab018..0448f7b4882 100644 --- a/bin/tests/system/resolver/ns9/named.conf.j2 +++ b/bin/tests/system/resolver/ns9/named.conf.j2 @@ -4,7 +4,7 @@ options { {% 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; }; + listen-on-v6 { @ns.ip6@; }; recursive-clients 0; // regression test for [GL #4987] dnssec-validation no; dual-stack-servers { fd92:7065:b8e:ffff::7; }; @@ -20,7 +20,7 @@ key rndc_key { /* deliberately not _common/controls.conf.j2: IPv6 control channel; the shared template is IPv4-only */ controls { - inet fd92:7065:b8e:ffff::9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; + inet @ns.ip6@ port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; zone "." { diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2 index a7a273b1f64..44c059bbdbd 100644 --- a/bin/tests/system/rndc/ns2/named.conf.j2 +++ b/bin/tests/system/rndc/ns2/named.conf.j2 @@ -17,7 +17,7 @@ key secondkey { /* deliberately not _common/controls.conf.j2: multi-key control channel is the test subject */ controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; secondkey; }; + inet @ns.ip@ port @CONTROLPORT@ allow { any; } keys { rndc_key; secondkey; }; }; diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2 index af36a4ec849..a480df3d77d 100644 --- a/bin/tests/system/rndc/ns5/named.conf.j2 +++ b/bin/tests/system/rndc/ns5/named.conf.j2 @@ -11,7 +11,7 @@ key rndc_key { /* deliberately not _common/controls.conf.j2: read-only control channel is the test subject */ controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; } read-only yes; + inet @ns.ip@ port @CONTROLPORT@ allow { any; } keys { rndc_key; } read-only yes; }; {% include "_common/root.hint.conf" %} diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2 index fce1fde48a9..3a21c78793f 100644 --- a/bin/tests/system/rpz/ns3/named.conf.j2 +++ b/bin/tests/system/rpz/ns3/named.conf.j2 @@ -47,7 +47,7 @@ options { servfail-until-ready yes ; - also-notify { 10.53.0.3 port @EXTRAPORT1@; }; + also-notify { @ns.ip@ port @EXTRAPORT1@; }; notify-delay 0; }; diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2 index 2afbb0adb83..c8338a38e33 100644 --- a/bin/tests/system/rpz/ns8/named.conf.j2 +++ b/bin/tests/system/rpz/ns8/named.conf.j2 @@ -22,7 +22,7 @@ options { nsip-enable yes ; - also-notify { 10.53.0.8 port @EXTRAPORT1@; }; + also-notify { @ns.ip@ port @EXTRAPORT1@; }; notify-delay 0; }; diff --git a/bin/tests/system/rpzextra/ns3/named.conf.j2 b/bin/tests/system/rpzextra/ns3/named.conf.j2 index c29ac72b6a8..5822ebd0da2 100644 --- a/bin/tests/system/rpzextra/ns3/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns3/named.conf.j2 @@ -69,7 +69,7 @@ view "second" { }; view "third" { - match-clients { 10.53.0.3; }; + match-clients { @ns.ip@; }; zone "." { type hint; file "root.db"; diff --git a/bin/tests/system/runtime/ns2/named6.conf.j2 b/bin/tests/system/runtime/ns2/named6.conf.j2 index 1a5eaa6d7a5..64756e2ce98 100644 --- a/bin/tests/system/runtime/ns2/named6.conf.j2 +++ b/bin/tests/system/runtime/ns2/named6.conf.j2 @@ -12,5 +12,5 @@ zone "ipv4-only-servers" { zone "ipv6-only-servers" { type secondary; - primaries { fd92:7065:b8e:ffff::2; }; + primaries { @ns.ip6@; }; }; diff --git a/bin/tests/system/selfpointedglue/ns3/named.conf.j2 b/bin/tests/system/selfpointedglue/ns3/named.conf.j2 index b48dc0b1847..a5534776179 100644 --- a/bin/tests/system/selfpointedglue/ns3/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns3/named.conf.j2 @@ -15,7 +15,7 @@ options { {% include_indented "_common/options/sources.conf.j2" %} {% include_indented "_common/options/server.conf.j2" %} listen-on { - 10.53.0.3; + @ns.ip@; 10.53.0.5; 10.53.0.6; 10.53.0.7; diff --git a/bin/tests/system/shutdown/ns2/named.conf.j2 b/bin/tests/system/shutdown/ns2/named.conf.j2 index 2380f02228a..0d24fa67c33 100644 --- a/bin/tests/system/shutdown/ns2/named.conf.j2 +++ b/bin/tests/system/shutdown/ns2/named.conf.j2 @@ -7,7 +7,7 @@ options { allow-query { any; }; }; -# 10.53.0.2 is authoritative for .test domain +# @ns.ip@ is authoritative for .test domain zone "test" { type primary; file "test.db"; diff --git a/bin/tests/system/staticstub/ns4/named.conf.j2 b/bin/tests/system/staticstub/ns4/named.conf.j2 index f98d2778b15..2db69bac0fd 100644 --- a/bin/tests/system/staticstub/ns4/named.conf.j2 +++ b/bin/tests/system/staticstub/ns4/named.conf.j2 @@ -1,7 +1,7 @@ options { {% include_indented "_common/options/sources.conf.j2" %} {% include_indented "_common/options/server.conf.j2" %} - listen-on { 10.53.0.4; }; + listen-on { @ns.ip@; }; listen-on-v6 { ::1; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/statistics/ns1/named.conf.j2 b/bin/tests/system/statistics/ns1/named.conf.j2 index 3e644464252..6c5aeae60eb 100644 --- a/bin/tests/system/statistics/ns1/named.conf.j2 +++ b/bin/tests/system/statistics/ns1/named.conf.j2 @@ -8,7 +8,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.1 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2 index e944ffda011..b0abf1d384e 100644 --- a/bin/tests/system/statistics/ns2/named1.conf.j2 +++ b/bin/tests/system/statistics/ns2/named1.conf.j2 @@ -5,7 +5,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.2 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2 index e7757d74ff3..4717f2aa375 100644 --- a/bin/tests/system/statistics/ns2/named2.conf.j2 +++ b/bin/tests/system/statistics/ns2/named2.conf.j2 @@ -5,7 +5,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.2 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2 index 92ea60e2159..0c3748dbfa4 100644 --- a/bin/tests/system/statistics/ns3/named.conf.j2 +++ b/bin/tests/system/statistics/ns3/named.conf.j2 @@ -7,7 +7,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.3 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/statschannel/ns1/named.conf.j2 b/bin/tests/system/statschannel/ns1/named.conf.j2 index 27b15fb8c74..6b8f46e49f5 100644 --- a/bin/tests/system/statschannel/ns1/named.conf.j2 +++ b/bin/tests/system/statschannel/ns1/named.conf.j2 @@ -1,7 +1,7 @@ options { {% include_indented "_common/options-dual.conf.j2" %} tls-port @TLSPORT@; - listen-on-v6 tls ephemeral { fd92:7065:b8e:ffff::1; }; + listen-on-v6 tls ephemeral { @ns.ip6@; }; recursion no; dnssec-validation no; notify explicit; @@ -9,7 +9,7 @@ options { version none; // make statistics independent of the version number }; -statistics-channels { inet 10.53.0.1 port @EXTRAPORT1@ allow { localhost; }; }; +statistics-channels { inet @ns.ip@ port @EXTRAPORT1@ allow { localhost; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/statschannel/ns2/named.conf.j2 b/bin/tests/system/statschannel/ns2/named.conf.j2 index dd0eaf7856d..d3162448da6 100644 --- a/bin/tests/system/statschannel/ns2/named.conf.j2 +++ b/bin/tests/system/statschannel/ns2/named.conf.j2 @@ -8,7 +8,7 @@ options { sig-signing-signatures 100; }; -statistics-channels { inet 10.53.0.2 port @EXTRAPORT1@ allow { localhost; }; }; +statistics-channels { inet @ns.ip@ port @EXTRAPORT1@ allow { localhost; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/statschannel/ns2/named2.conf.j2 b/bin/tests/system/statschannel/ns2/named2.conf.j2 index 864c9d00bac..cfae300ccd8 100644 --- a/bin/tests/system/statschannel/ns2/named2.conf.j2 +++ b/bin/tests/system/statschannel/ns2/named2.conf.j2 @@ -8,7 +8,7 @@ options { sig-signing-signatures 100; }; -statistics-channels { inet 10.53.0.2 port @EXTRAPORT1@ allow { localhost; }; }; +statistics-channels { inet @ns.ip@ port @EXTRAPORT1@ allow { localhost; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/statschannel/ns3/named.conf.j2 b/bin/tests/system/statschannel/ns3/named.conf.j2 index d8ab2e0b136..f00fe729f81 100644 --- a/bin/tests/system/statschannel/ns3/named.conf.j2 +++ b/bin/tests/system/statschannel/ns3/named.conf.j2 @@ -11,7 +11,7 @@ options { allow-new-zones yes; }; -statistics-channels { inet 10.53.0.3 port @EXTRAPORT1@ allow { localhost; }; }; +statistics-channels { inet @ns.ip@ port @EXTRAPORT1@ allow { localhost; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/statschannel/ns4/named.conf.j2 b/bin/tests/system/statschannel/ns4/named.conf.j2 index e96b1aa90b1..2f9bb22e4f7 100644 --- a/bin/tests/system/statschannel/ns4/named.conf.j2 +++ b/bin/tests/system/statschannel/ns4/named.conf.j2 @@ -6,7 +6,7 @@ options { version none; // make statistics independent of the version number }; -statistics-channels { inet 10.53.0.4 port @EXTRAPORT1@ allow { localhost; }; }; +statistics-channels { inet @ns.ip@ port @EXTRAPORT1@ allow { localhost; }; }; {% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 index 7abd7a4fa38..7ba10e51e20 100644 --- a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 @@ -10,7 +10,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.1 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 index 88d94fc25c3..aeff5139171 100644 --- a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 @@ -10,7 +10,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.2 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 index 1996f3b1caf..0bb7c17be57 100644 --- a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 @@ -10,7 +10,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.3 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 index 4aacdb68b3d..35894f44b41 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 @@ -11,7 +11,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.4 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 index df286572019..4ebf39459fd 100644 --- a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 @@ -12,7 +12,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.5 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 index b6a427cfff6..48969920d9f 100644 --- a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 @@ -11,7 +11,7 @@ options { {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { - inet 10.53.0.6 port @EXTRAPORT1@ allow { any; }; + inet @ns.ip@ port @EXTRAPORT1@ allow { any; }; }; {% endif %} diff --git a/bin/tests/system/transport_acl/ns1/named.conf.j2 b/bin/tests/system/transport_acl/ns1/named.conf.j2 index c0c3617d64a..f6debfcb0a1 100644 --- a/bin/tests/system/transport_acl/ns1/named.conf.j2 +++ b/bin/tests/system/transport_acl/ns1/named.conf.j2 @@ -9,11 +9,11 @@ options { {% include_indented "_common/options.conf.j2" %} ## # generic test - listen-on port @TLSPORT@ tls self-signed { 10.53.0.1; }; + listen-on port @TLSPORT@ tls self-signed { @ns.ip@; }; # test #1 - listen-on port @EXTRAPORT1@ { 10.53.0.1; }; + listen-on port @EXTRAPORT1@ { @ns.ip@; }; listen-on port @EXTRAPORT1@ tls self-signed { 10.53.0.2; }; - listen-on port @EXTRAPORT2@ { 10.53.0.1; }; + listen-on port @EXTRAPORT2@ { @ns.ip@; }; listen-on port @EXTRAPORT2@ tls self-signed { 10.53.0.2; }; # test #2 listen-on port @EXTRAPORT1@ { 10.53.0.3; }; @@ -30,17 +30,17 @@ options { listen-on port @EXTRAPORT2@ { 10.53.0.5; }; listen-on port @EXTRAPORT1@ tls self-signed { 10.53.0.6; }; # test #5 - listen-on port @EXTRAPORT3@ tls self-signed { 10.53.0.1; }; - listen-on port @EXTRAPORT4@ tls self-signed { 10.53.0.1; }; + listen-on port @EXTRAPORT3@ tls self-signed { @ns.ip@; }; + listen-on port @EXTRAPORT4@ tls self-signed { @ns.ip@; }; listen-on port @EXTRAPORT3@ { 10.53.0.2; }; # test #6 - listen-on port @EXTRAPORT5@ { 10.53.0.1; }; + listen-on port @EXTRAPORT5@ { @ns.ip@; }; # test #7 - listen-on port @EXTRAPORT6@ tls self-signed { 10.53.0.1; }; + listen-on port @EXTRAPORT6@ tls self-signed { @ns.ip@; }; # test #7 - listen-on port @EXTRAPORT7@ tls self-signed { 10.53.0.1; }; + listen-on port @EXTRAPORT7@ tls self-signed { @ns.ip@; }; # test #8 - listen-on port @EXTRAPORT8@ { 10.53.0.1; }; + listen-on port @EXTRAPORT8@ { @ns.ip@; }; ## recursion no; notify explicit; @@ -101,7 +101,7 @@ zone "example7" { zone "example8" { type primary; file "example.db"; - allow-transfer port @EXTRAPORT7@ transport tls { 10.53.0.1; 10.53.0.2; 10.53.0.3; }; + allow-transfer port @EXTRAPORT7@ transport tls { @ns.ip@; 10.53.0.2; 10.53.0.3; }; }; zone "example9" { 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 8e29f8e4035..a45e5e9de5a 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 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ proxy plain tls none http default { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ proxy plain tls none http default { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ proxy plain tls none http default { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ proxy plain tls none http default { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 0538153f925..072b62b5696 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 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ tls none http default { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ tls none http default { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ tls none http default { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ tls none http default { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 0c57785bd6c..ed110651a8e 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 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ proxy encrypted tls self-signed http default { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ proxy encrypted tls self-signed http default { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ proxy encrypted tls self-signed http default { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ proxy encrypted tls self-signed http default { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 d0898653021..61acad0898d 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 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ proxy plain tls self-signed http default { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ proxy plain tls self-signed http default { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ proxy plain tls self-signed http default { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ proxy plain tls self-signed http default { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 a13829e3016..f78abd83560 100644 --- a/bin/tests/system/transport_change/ns1/named-https.conf.j2 +++ b/bin/tests/system/transport_change/ns1/named-https.conf.j2 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ tls self-signed http default { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ tls self-signed http default { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ tls self-signed http default { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ tls self-signed http default { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 aeeab8c0660..bbfbbce8249 100644 --- a/bin/tests/system/transport_change/ns1/named-proxy.conf.j2 +++ b/bin/tests/system/transport_change/ns1/named-proxy.conf.j2 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test - listen-on port @EXTRAPORT1@ proxy plain { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ proxy plain { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ proxy plain { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ proxy plain { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 60bbe2f7ce3..261ff42738c 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 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ proxy encrypted tls self-signed { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ proxy encrypted tls self-signed { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ proxy encrypted tls self-signed { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ proxy encrypted tls self-signed { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 1f5b2bf1d43..54b967578e6 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 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ proxy plain tls self-signed { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ proxy plain tls self-signed { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ proxy plain tls self-signed { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ proxy plain tls self-signed { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; 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 9467f9c5c87..06e3f5356dc 100644 --- a/bin/tests/system/transport_change/ns1/named-tls.conf.j2 +++ b/bin/tests/system/transport_change/ns1/named-tls.conf.j2 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test TLS - listen-on port @EXTRAPORT1@ tls self-signed { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ tls self-signed { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ tls self-signed { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ tls self-signed { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; diff --git a/bin/tests/system/transport_change/ns1/named.conf.j2 b/bin/tests/system/transport_change/ns1/named.conf.j2 index c074d3cfc21..900540169f3 100644 --- a/bin/tests/system/transport_change/ns1/named.conf.j2 +++ b/bin/tests/system/transport_change/ns1/named.conf.j2 @@ -10,10 +10,10 @@ options { {% include_indented "_common/options/server.conf.j2" %} ## # generic - listen-on { 10.53.0.1; }; + listen-on { @ns.ip@; }; # test - listen-on port @EXTRAPORT1@ { 10.53.0.1; }; - listen-on-v6 port @EXTRAPORT1@ { fd92:7065:b8e:ffff::1; }; + listen-on port @EXTRAPORT1@ { @ns.ip@; }; + listen-on-v6 port @EXTRAPORT1@ { @ns.ip6@; }; ## recursion no; notify explicit; @@ -21,7 +21,7 @@ options { dnssec-validation no; tcp-initial-timeout 1200; allow-proxy { any; }; - allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; }; + allow-proxy-on { @ns.ip@; @ns.ip6@; }; }; diff --git a/bin/tests/system/tsiggss/ns1/named.conf.j2 b/bin/tests/system/tsiggss/ns1/named.conf.j2 index 1dac37dc9f3..4d81ed22c54 100644 --- a/bin/tests/system/tsiggss/ns1/named.conf.j2 +++ b/bin/tests/system/tsiggss/ns1/named.conf.j2 @@ -2,7 +2,7 @@ options { {% 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 { @ns.ip@; 127.0.0.1; }; listen-on-v6 { none; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/upforwd/ns1/named.conf.j2 b/bin/tests/system/upforwd/ns1/named.conf.j2 index ea409efdead..62b46d855ac 100644 --- a/bin/tests/system/upforwd/ns1/named.conf.j2 +++ b/bin/tests/system/upforwd/ns1/named.conf.j2 @@ -6,7 +6,7 @@ key "update.example." { options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls ephemeral { 10.53.0.1; }; + listen-on tls ephemeral { @ns.ip@; }; allow-transfer { any; }; dnssec-validation no; }; diff --git a/bin/tests/system/upforwd/ns3/named.conf.j2 b/bin/tests/system/upforwd/ns3/named.conf.j2 index f76991ec868..0daf81bfa6b 100644 --- a/bin/tests/system/upforwd/ns3/named.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named.conf.j2 @@ -1,7 +1,7 @@ options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls ephemeral { 10.53.0.3; }; + listen-on tls ephemeral { @ns.ip@; }; allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/upforwd/ns3/named2.conf.j2 b/bin/tests/system/upforwd/ns3/named2.conf.j2 index 8d76b1552b4..bc9d61b1f47 100644 --- a/bin/tests/system/upforwd/ns3/named2.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named2.conf.j2 @@ -1,7 +1,7 @@ options { {% include_indented "_common/options.conf.j2" %} tls-port @TLSPORT@; - listen-on tls ephemeral { 10.53.0.3; }; + listen-on tls ephemeral { @ns.ip@; }; allow-transfer { any; }; recursion no; dnssec-validation no; diff --git a/bin/tests/system/views/ns2/named2.conf.j2 b/bin/tests/system/views/ns2/named2.conf.j2 index db9b2a783f5..2609cf95982 100644 --- a/bin/tests/system/views/ns2/named2.conf.j2 +++ b/bin/tests/system/views/ns2/named2.conf.j2 @@ -1,7 +1,7 @@ options { {% 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 { @ns.ip@; 10.53.0.4; }; listen-on-v6 { none; }; allow-transfer { any; }; dnssec-validation no; @@ -17,7 +17,7 @@ dnssec-policy "views" { }; view "internal" { - match-clients { 10.53.0.2; + match-clients { @ns.ip@; 10.53.0.3; }; {% include_indented "_common/root.hint.conf" %} diff --git a/bin/tests/system/xfer/ns1/named.conf.j2 b/bin/tests/system/xfer/ns1/named.conf.j2 index 60c7a30f922..3785b24f949 100644 --- a/bin/tests/system/xfer/ns1/named.conf.j2 +++ b/bin/tests/system/xfer/ns1/named.conf.j2 @@ -36,7 +36,7 @@ zone "axfr-rndc-retransfer-force" { {% if enable_some_zones | default(True) %} zone "secondary" { type primary; - allow-transfer { 10.53.0.1; 10.53.0.2; 10.53.0.6; 10.53.0.7; }; + allow-transfer { @ns.ip@; 10.53.0.2; 10.53.0.6; 10.53.0.7; }; file "sec.db"; }; diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2 index 64125866208..78245b6388c 100644 --- a/bin/tests/system/xfer/ns2/named.conf.j2 +++ b/bin/tests/system/xfer/ns2/named.conf.j2 @@ -31,7 +31,7 @@ zone "tsigzone" { allow-transfer { tzkey; }; }; -remote-servers "ns1" port @PORT@ source 10.53.0.2 { +remote-servers "ns1" port @PORT@ source @ns.ip@ { 10.53.0.1; }; diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2 index 1ae5503b14d..79fe275b02b 100644 --- a/bin/tests/system/xfer/ns3/named.conf.j2 +++ b/bin/tests/system/xfer/ns3/named.conf.j2 @@ -21,7 +21,7 @@ zone "example" { zone "primary" { type secondary; - transfer-source 10.53.0.3; + transfer-source @ns.ip@; primaries { 10.53.0.6; }; file "primary.bk"; }; 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 431367cd137..77670160b14 100644 --- a/bin/tests/system/xfer_servers_list/ns1/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns1/named.conf.j2 @@ -1,8 +1,8 @@ options { {% include_indented "_common/options/server.conf.j2" %} {% include_indented "_common/options/listen.conf.j2" %} - query-source address 10.53.0.1; - transfer-source 10.53.0.1; + query-source address @ns.ip@; + transfer-source @ns.ip@; recursion no; /* * Notifications are sent from 10.53.1.1. This, the `notify