From: Nicki Křížek Date: Wed, 8 Jul 2026 18:13:26 +0000 (+0000) Subject: Use controls template in named configs where rndc key was inlined X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=45e9d7d1cb4432c3ddd0aed182fbc25a4ba68494;p=thirdparty%2Fbind9.git Use controls template in named configs where rndc key was inlined Replace all occurences of rndc_key and controls channel config with the standard _common/controls.conf.j2 template. The server's IP address will be automatically filled in based on the instance's directory name (nsX -> 10.53.0.X) using the @ns.ip@ dir-specific template variable. The controls template also include the `rndc_key`, so any uses of that remain functional. If present, the empty controls section were removed, since they were redundant. The logfileconfig configs used quoted `"rndc-key"` and were switched to `rndc_key` instead. The specific use-case of quoted key using a hyphen will be re-added in one of the followup commits as a dedicated test. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/acl/ns2/named.conf.j2 b/bin/tests/system/acl/ns2/named.conf.j2 index 21f832daf86..d932199a3b6 100644 --- a/bin/tests/system/acl/ns2/named.conf.j2 +++ b/bin/tests/system/acl/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/acl/ns2/named2.conf.j2 b/bin/tests/system/acl/ns2/named2.conf.j2 index ba5b26d81e3..15d9e2f2499 100644 --- a/bin/tests/system/acl/ns2/named2.conf.j2 +++ b/bin/tests/system/acl/ns2/named2.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2 index b0d7863111d..7833044d25f 100644 --- a/bin/tests/system/acl/ns2/named3.conf.j2 +++ b/bin/tests/system/acl/ns2/named3.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2 index 5cdac06fde2..87d3482a7c9 100644 --- a/bin/tests/system/acl/ns2/named4.conf.j2 +++ b/bin/tests/system/acl/ns2/named4.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2 index 963e104bae3..2e476c33598 100644 --- a/bin/tests/system/acl/ns2/named5.conf.j2 +++ b/bin/tests/system/acl/ns2/named5.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/acl/ns3/named.conf.j2 b/bin/tests/system/acl/ns3/named.conf.j2 index c05a0d7953a..2bcad4b4793 100644 --- a/bin/tests/system/acl/ns3/named.conf.j2 +++ b/bin/tests/system/acl/ns3/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} template "allow-xfr" { type primary; diff --git a/bin/tests/system/acl/ns4/named.conf.j2 b/bin/tests/system/acl/ns4/named.conf.j2 index e9d5764a161..2768fa40857 100644 --- a/bin/tests/system/acl/ns4/named.conf.j2 +++ b/bin/tests/system/acl/ns4/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} zone "existing" { type primary; diff --git a/bin/tests/system/addzone/ns1/named.conf.j2 b/bin/tests/system/addzone/ns1/named.conf.j2 index b97f12aaeb5..0213610d8da 100644 --- a/bin/tests/system/addzone/ns1/named.conf.j2 +++ b/bin/tests/system/addzone/ns1/named.conf.j2 @@ -1,13 +1,6 @@ {% set allownewzones = allownewzones | default(True) %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/allow_query/ns3/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2 index e0ac810bb81..6eeda13943e 100644 --- a/bin/tests/system/allow_query/ns3/named.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named.conf.j2 @@ -7,14 +7,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2 index 484109987ea..236657096ab 100644 --- a/bin/tests/system/allow_query/ns3/named2.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named2.conf.j2 @@ -10,14 +10,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/allow_query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2 index dff402e4ff2..31898b6d97e 100644 --- a/bin/tests/system/allow_query/ns3/named3.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named3.conf.j2 @@ -10,14 +10,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/allow_query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2 index 07195a69c25..42f347def63 100644 --- a/bin/tests/system/allow_query/ns3/named4.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named4.conf.j2 @@ -10,14 +10,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/allow_query/ns3/named5.conf.j2 b/bin/tests/system/allow_query/ns3/named5.conf.j2 index 3b0f6b29e43..7190acb002b 100644 --- a/bin/tests/system/allow_query/ns3/named5.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named5.conf.j2 @@ -8,14 +8,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view internal { match-destinations { 10.53.0.3; }; diff --git a/bin/tests/system/allow_query/ns3/named6.conf.j2 b/bin/tests/system/allow_query/ns3/named6.conf.j2 index 21d8d2a5739..37980e39731 100644 --- a/bin/tests/system/allow_query/ns3/named6.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named6.conf.j2 @@ -8,14 +8,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view internal { match-destinations { 10.53.0.3; }; diff --git a/bin/tests/system/allow_query/ns3/named7.conf.j2 b/bin/tests/system/allow_query/ns3/named7.conf.j2 index 001c0079530..2ea932ac124 100644 --- a/bin/tests/system/allow_query/ns3/named7.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named7.conf.j2 @@ -8,14 +8,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view internal { match-destinations { 10.53.0.3; }; diff --git a/bin/tests/system/allow_query/ns3/named8.conf.j2 b/bin/tests/system/allow_query/ns3/named8.conf.j2 index cfcbe45d636..d03e2729797 100644 --- a/bin/tests/system/allow_query/ns3/named8.conf.j2 +++ b/bin/tests/system/allow_query/ns3/named8.conf.j2 @@ -8,14 +8,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view internal { zone "." { diff --git a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 index 2ac382e0032..fb5a71a7efb 100644 --- a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 +++ b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2 @@ -18,11 +18,4 @@ zone "." { file "example.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/autosign/ns1/named.conf.j2 b/bin/tests/system/autosign/ns1/named.conf.j2 index 154067e98ec..05ec5d14798 100644 --- a/bin/tests/system/autosign/ns1/named.conf.j2 +++ b/bin/tests/system/autosign/ns1/named.conf.j2 @@ -14,14 +14,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/autosign/ns2/named.conf.j2 b/bin/tests/system/autosign/ns2/named.conf.j2 index 92ff6a9835e..9ab22a0da2d 100644 --- a/bin/tests/system/autosign/ns2/named.conf.j2 +++ b/bin/tests/system/autosign/ns2/named.conf.j2 @@ -15,14 +15,7 @@ options { dnssec-loadkeys-interval 30; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "autosign" { keys { diff --git a/bin/tests/system/autosign/ns3/named.conf.j2 b/bin/tests/system/autosign/ns3/named.conf.j2 index 72bb03d447c..08ff163a8e0 100644 --- a/bin/tests/system/autosign/ns3/named.conf.j2 +++ b/bin/tests/system/autosign/ns3/named.conf.j2 @@ -1,7 +1,5 @@ // NS3 -controls { /* empty */ }; - options { query-source address 10.53.0.3; notify-source 10.53.0.3; @@ -19,14 +17,7 @@ options { allow-new-zones yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} # The default dnssec-policy "autosign" { diff --git a/bin/tests/system/cache_delegns/ns2/named.conf.j2 b/bin/tests/system/cache_delegns/ns2/named.conf.j2 index 6ab4db60579..8f5bea44ba5 100644 --- a/bin/tests/system/cache_delegns/ns2/named.conf.j2 +++ b/bin/tests/system/cache_delegns/ns2/named.conf.j2 @@ -43,11 +43,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2 index b6dd7f7429c..1b9e51273fd 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf.j2 +++ b/bin/tests/system/cacheclean/ns2/named.conf.j2 @@ -17,14 +17,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/camp/ns3/named.conf.j2 b/bin/tests/system/camp/ns3/named.conf.j2 index 71ea0ed83b0..c255ca9af8b 100644 --- a/bin/tests/system/camp/ns3/named.conf.j2 +++ b/bin/tests/system/camp/ns3/named.conf.j2 @@ -14,14 +14,7 @@ options { max-query-count 150; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "final.tld0" { type primary; diff --git a/bin/tests/system/camp/ns9/named.conf.j2 b/bin/tests/system/camp/ns9/named.conf.j2 index 176c2c4e5bb..5fc254a6e00 100644 --- a/bin/tests/system/camp/ns9/named.conf.j2 +++ b/bin/tests/system/camp/ns9/named.conf.j2 @@ -16,13 +16,6 @@ options { max-query-count 50; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/cap_glues/ns3/named.conf.j2 b/bin/tests/system/cap_glues/ns3/named.conf.j2 index 32a161cf2b2..f5863da1a25 100644 --- a/bin/tests/system/cap_glues/ns3/named.conf.j2 +++ b/bin/tests/system/cap_glues/ns3/named.conf.j2 @@ -21,11 +21,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 b/bin/tests/system/cdnxdomain/ns1/named.conf.j2 index bd75facb6dd..64f316253f4 100644 --- a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 +++ b/bin/tests/system/cdnxdomain/ns1/named.conf.j2 @@ -1,13 +1,6 @@ // NS1 - validating resolver, forwards "example" to the signed NS2 -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/cdnxdomain/ns2/named.conf.j2 b/bin/tests/system/cdnxdomain/ns2/named.conf.j2 index f05dd33c733..4624efedf08 100644 --- a/bin/tests/system/cdnxdomain/ns2/named.conf.j2 +++ b/bin/tests/system/cdnxdomain/ns2/named.conf.j2 @@ -1,13 +1,6 @@ // NS2 - signed authoritative server for "example" -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/chain/ns7/named.conf.j2 b/bin/tests/system/chain/ns7/named.conf.j2 index 076c79caf30..2ff410965a6 100644 --- a/bin/tests/system/chain/ns7/named.conf.j2 +++ b/bin/tests/system/chain/ns7/named.conf.j2 @@ -19,19 +19,12 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - key restart16 { secret "1234abcd8765"; algorithm @DEFAULT_HMAC@; }; -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view restart16 { match-clients { key restart16; none; }; diff --git a/bin/tests/system/chase_ds/ns3/named.conf.j2 b/bin/tests/system/chase_ds/ns3/named.conf.j2 index 6cca4413771..90af32b9cac 100644 --- a/bin/tests/system/chase_ds/ns3/named.conf.j2 +++ b/bin/tests/system/chase_ds/ns3/named.conf.j2 @@ -15,13 +15,6 @@ zone "." { file "../../_common/root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "trusted.conf"; diff --git a/bin/tests/system/checkds/ns10/named.conf.j2 b/bin/tests/system/checkds/ns10/named.conf.j2 index c0062a6bcd2..1f971d3e7df 100644 --- a/bin/tests/system/checkds/ns10/named.conf.j2 +++ b/bin/tests/system/checkds/ns10/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.10 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "ns2" { type secondary; diff --git a/bin/tests/system/checkds/ns2/named.conf.j2 b/bin/tests/system/checkds/ns2/named.conf.j2 index 8e5b8115bfa..d92f1b6fc47 100644 --- a/bin/tests/system/checkds/ns2/named.conf.j2 +++ b/bin/tests/system/checkds/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/checkds/ns3/named.conf.j2 b/bin/tests/system/checkds/ns3/named.conf.j2 index d49b614cd9f..a44cdff7fe1 100644 --- a/bin/tests/system/checkds/ns3/named.conf.j2 +++ b/bin/tests/system/checkds/ns3/named.conf.j2 @@ -11,14 +11,7 @@ options { session-keyfile "session.key"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/checkds/ns4/named.conf.j2 b/bin/tests/system/checkds/ns4/named.conf.j2 index a97b5b351db..24dd9ea86c6 100644 --- a/bin/tests/system/checkds/ns4/named.conf.j2 +++ b/bin/tests/system/checkds/ns4/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "ns2" { type secondary; diff --git a/bin/tests/system/checkds/ns5/named.conf.j2 b/bin/tests/system/checkds/ns5/named.conf.j2 index 5146e214c77..ceb65eea817 100644 --- a/bin/tests/system/checkds/ns5/named.conf.j2 +++ b/bin/tests/system/checkds/ns5/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/checkds/ns6/named.conf.j2 b/bin/tests/system/checkds/ns6/named.conf.j2 index 34ae89b79b3..7a1c726b277 100644 --- a/bin/tests/system/checkds/ns6/named.conf.j2 +++ b/bin/tests/system/checkds/ns6/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/checkds/ns7/named.conf.j2 b/bin/tests/system/checkds/ns7/named.conf.j2 index 616e94cdf69..ddd5c883d21 100644 --- a/bin/tests/system/checkds/ns7/named.conf.j2 +++ b/bin/tests/system/checkds/ns7/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "ns2" { type secondary; diff --git a/bin/tests/system/checkds/ns8/named.conf.j2 b/bin/tests/system/checkds/ns8/named.conf.j2 index 30d40627220..518dfe584c1 100644 --- a/bin/tests/system/checkds/ns8/named.conf.j2 +++ b/bin/tests/system/checkds/ns8/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "ns2" { type secondary; diff --git a/bin/tests/system/checkds/ns9/named.conf.j2 b/bin/tests/system/checkds/ns9/named.conf.j2 index c128563a82f..b42d222434c 100644 --- a/bin/tests/system/checkds/ns9/named.conf.j2 +++ b/bin/tests/system/checkds/ns9/named.conf.j2 @@ -15,14 +15,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} remote-servers "ns8" port @PORT@ { 10.53.0.8; diff --git a/bin/tests/system/class/ns1/named.conf.j2 b/bin/tests/system/class/ns1/named.conf.j2 index cdf9f2de332..66ead536c84 100644 --- a/bin/tests/system/class/ns1/named.conf.j2 +++ b/bin/tests/system/class/ns1/named.conf.j2 @@ -8,11 +8,4 @@ options { listen-on-v6 { none; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/class/ns2/named.conf.j2 b/bin/tests/system/class/ns2/named.conf.j2 index 08fe4fced47..af6630a9be3 100644 --- a/bin/tests/system/class/ns2/named.conf.j2 +++ b/bin/tests/system/class/ns2/named.conf.j2 @@ -9,14 +9,7 @@ options { listen-on-v6 { none; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view default { match-clients { any; }; diff --git a/bin/tests/system/class/ns3/named.conf.j2 b/bin/tests/system/class/ns3/named.conf.j2 index 98b955162b5..524708e1587 100644 --- a/bin/tests/system/class/ns3/named.conf.j2 +++ b/bin/tests/system/class/ns3/named.conf.j2 @@ -9,11 +9,4 @@ options { listen-on-v6 { none; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/configloading/ns1/named.conf.j2 b/bin/tests/system/configloading/ns1/named.conf.j2 index 034432237fd..861339e5217 100644 --- a/bin/tests/system/configloading/ns1/named.conf.j2 +++ b/bin/tests/system/configloading/ns1/named.conf.j2 @@ -8,14 +8,7 @@ options { recursion no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view "default" { zone "example." { diff --git a/bin/tests/system/cookie/ns1/named.conf.j2 b/bin/tests/system/cookie/ns1/named.conf.j2 index 153de1e0c54..b11e8e03241 100644 --- a/bin/tests/system/cookie/ns1/named.conf.j2 +++ b/bin/tests/system/cookie/ns1/named.conf.j2 @@ -1,8 +1,3 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - key foo { secret "aaaaaaaaaaaa"; algorithm @DEFAULT_HMAC@; @@ -12,9 +7,7 @@ server 10.53.0.10 { keys foo; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/cookie/ns3/named.conf.j2 b/bin/tests/system/cookie/ns3/named.conf.j2 index 1030e3ecc07..8ad600762c7 100644 --- a/bin/tests/system/cookie/ns3/named.conf.j2 +++ b/bin/tests/system/cookie/ns3/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/cookie/ns4/named.conf.j2 b/bin/tests/system/cookie/ns4/named.conf.j2 index 60bce3bcdad..a08c6371dc0 100644 --- a/bin/tests/system/cookie/ns4/named.conf.j2 +++ b/bin/tests/system/cookie/ns4/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.4; diff --git a/bin/tests/system/cookie/ns5/named.conf.j2 b/bin/tests/system/cookie/ns5/named.conf.j2 index ec04a5dd62f..1ca3a38b0c9 100644 --- a/bin/tests/system/cookie/ns5/named.conf.j2 +++ b/bin/tests/system/cookie/ns5/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.5; diff --git a/bin/tests/system/cookie/ns6/named.conf.j2 b/bin/tests/system/cookie/ns6/named.conf.j2 index 2092c9cebb0..0192fe1cdc9 100644 --- a/bin/tests/system/cookie/ns6/named.conf.j2 +++ b/bin/tests/system/cookie/ns6/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.6; diff --git a/bin/tests/system/cookie/ns8/named.conf.j2 b/bin/tests/system/cookie/ns8/named.conf.j2 index 137397a10a0..9ad6dbe56ac 100644 --- a/bin/tests/system/cookie/ns8/named.conf.j2 +++ b/bin/tests/system/cookie/ns8/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.8; diff --git a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 b/bin/tests/system/cyclic_glue/ns1/named.conf.j2 index 44f64403e4f..83f0b18acd8 100644 --- a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns1/named.conf.j2 @@ -16,11 +16,4 @@ zone "." { file "root.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 b/bin/tests/system/cyclic_glue/ns4/named.conf.j2 index 68886228740..8566d2afbca 100644 --- a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 +++ b/bin/tests/system/cyclic_glue/ns4/named.conf.j2 @@ -15,11 +15,4 @@ zone "." { file "../../_common/root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/database/ns1/named.conf.j2 b/bin/tests/system/database/ns1/named.conf.j2 index 6459dcad42d..1df289aa7cf 100644 --- a/bin/tests/system/database/ns1/named.conf.j2 +++ b/bin/tests/system/database/ns1/named.conf.j2 @@ -1,13 +1,6 @@ // NS1 -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 index 04a64c15ef8..b425652cde5 100644 --- a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 +++ b/bin/tests/system/delegation_ttl/ns2/named.conf.j2 @@ -23,11 +23,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 b/bin/tests/system/delegdb_flush/ns1/named.conf.j2 index e9204885fcc..d10647de51f 100644 --- a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 +++ b/bin/tests/system/delegdb_flush/ns1/named.conf.j2 @@ -9,11 +9,4 @@ statistics-channels { inet 10.53.0.1 port @EXTRAPORT1@; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/dispatch/ns1/named.conf.j2 b/bin/tests/system/dispatch/ns1/named.conf.j2 index 248c4a5efd7..7573a5308e1 100644 --- a/bin/tests/system/dispatch/ns1/named.conf.j2 +++ b/bin/tests/system/dispatch/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/dispatch/ns2/named.conf.j2 b/bin/tests/system/dispatch/ns2/named.conf.j2 index c334793d6d5..4c5244b86a9 100644 --- a/bin/tests/system/dispatch/ns2/named.conf.j2 +++ b/bin/tests/system/dispatch/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.j2 b/bin/tests/system/dlzexternal/ns1/named.conf.j2 index 972a078f820..9b053f04cac 100644 --- a/bin/tests/system/dlzexternal/ns1/named.conf.j2 +++ b/bin/tests/system/dlzexternal/ns1/named.conf.j2 @@ -13,16 +13,9 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - include "ddns.key"; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dlz "example one" { database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ example.nil"; diff --git a/bin/tests/system/dnssec/ns2/named.conf.j2 b/bin/tests/system/dnssec/ns2/named.conf.j2 index f492c7cc1c5..947d9e29a9a 100644 --- a/bin/tests/system/dnssec/ns2/named.conf.j2 +++ b/bin/tests/system/dnssec/ns2/named.conf.j2 @@ -17,14 +17,7 @@ options { notify-delay 1; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "dnssec" { keys { diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2 index 4e1dc2c5d2b..32ece18c4bc 100644 --- a/bin/tests/system/dnssec/ns3/named.conf.j2 +++ b/bin/tests/system/dnssec/ns3/named.conf.j2 @@ -19,14 +19,7 @@ options { session-keyfile "session.key"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "dnssec" { keys { diff --git a/bin/tests/system/dnssec/ns4/named.conf.j2 b/bin/tests/system/dnssec/ns4/named.conf.j2 index af538cf92c6..d72dc52bf16 100644 --- a/bin/tests/system/dnssec/ns4/named.conf.j2 +++ b/bin/tests/system/dnssec/ns4/named.conf.j2 @@ -39,14 +39,7 @@ options { include "trusted.conf"; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if multi_view %} view rec { diff --git a/bin/tests/system/dnssec/ns5/named.conf.j2 b/bin/tests/system/dnssec/ns5/named.conf.j2 index 74f0e2e051a..bc128cc6a74 100644 --- a/bin/tests/system/dnssec/ns5/named.conf.j2 +++ b/bin/tests/system/dnssec/ns5/named.conf.j2 @@ -23,14 +23,7 @@ options { {% endif %} }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if revoked_key %} view root { diff --git a/bin/tests/system/dnssec/ns9/named.conf.j2 b/bin/tests/system/dnssec/ns9/named.conf.j2 index 9adafe4bbf5..5ba53ae1975 100644 --- a/bin/tests/system/dnssec/ns9/named.conf.j2 +++ b/bin/tests/system/dnssec/ns9/named.conf.j2 @@ -22,14 +22,7 @@ options { servfail-ttl 0; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "trusted.conf"; include "trusted-localkey.conf"; diff --git a/bin/tests/system/dnstap/ns1/named.conf.j2 b/bin/tests/system/dnstap/ns1/named.conf.j2 index be78dac0999..c97733947f6 100644 --- a/bin/tests/system/dnstap/ns1/named.conf.j2 +++ b/bin/tests/system/dnstap/ns1/named.conf.j2 @@ -20,14 +20,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2 index 0c4253c38ce..2ff7d5bd65b 100644 --- a/bin/tests/system/dnstap/ns2/named.conf.j2 +++ b/bin/tests/system/dnstap/ns2/named.conf.j2 @@ -20,14 +20,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2 index 5cc303bc64d..41ae7423b33 100644 --- a/bin/tests/system/dnstap/ns3/named.conf.j2 +++ b/bin/tests/system/dnstap/ns3/named.conf.j2 @@ -23,14 +23,7 @@ options { server 10.53.0.1 { tcp-only yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2 index b8aad0ea386..5b36841bc53 100644 --- a/bin/tests/system/dnstap/ns4/named.conf.j2 +++ b/bin/tests/system/dnstap/ns4/named.conf.j2 @@ -22,14 +22,7 @@ options { server 10.53.0.1 { tcp-only yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/dnstap/ns5/named.conf.j2 b/bin/tests/system/dnstap/ns5/named.conf.j2 index 480302969b6..a62d67681d2 100644 --- a/bin/tests/system/dnstap/ns5/named.conf.j2 +++ b/bin/tests/system/dnstap/ns5/named.conf.j2 @@ -21,11 +21,4 @@ options { forward only; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/dyndb/ns1/named.conf.j2 b/bin/tests/system/dyndb/ns1/named.conf.j2 index 6d94807ba0b..7740ad64eb3 100644 --- a/bin/tests/system/dyndb/ns1/named.conf.j2 +++ b/bin/tests/system/dyndb/ns1/named.conf.j2 @@ -1,5 +1,3 @@ -controls { }; - options { query-source address 10.53.0.1; notify-source 10.53.0.1; @@ -14,14 +12,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dyndb sample "@TOP_BUILDDIR@/testlib-driver-sample.@DYLIB@" { ipv4.example.nil. in-addr.arpa. }; dyndb sample2 "@TOP_BUILDDIR@/testlib-driver-sample.@DYLIB@" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. }; diff --git a/bin/tests/system/ede24/ns1/named.conf.j2 b/bin/tests/system/ede24/ns1/named.conf.j2 index 8b7ff500cf3..0c3381f2e0a 100644 --- a/bin/tests/system/ede24/ns1/named.conf.j2 +++ b/bin/tests/system/ede24/ns1/named.conf.j2 @@ -13,11 +13,4 @@ zone "foo.fr" { file "foo.fr.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/ede24/ns2/named.conf.j2 b/bin/tests/system/ede24/ns2/named.conf.j2 index 3db3e37a815..4aa4f86e396 100644 --- a/bin/tests/system/ede24/ns2/named.conf.j2 +++ b/bin/tests/system/ede24/ns2/named.conf.j2 @@ -12,11 +12,4 @@ zone "foo.fr" { primaries { 10.53.0.1 port @PORT@; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/emptyzones/ns1/named.conf.j2 b/bin/tests/system/emptyzones/ns1/named.conf.j2 index d8dabe41517..ec38a9f55d5 100644 --- a/bin/tests/system/emptyzones/ns1/named.conf.j2 +++ b/bin/tests/system/emptyzones/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - algorithm @DEFAULT_HMAC@; - secret "1234abcd8765"; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/enginepkcs11/ns1/named.conf.j2 b/bin/tests/system/enginepkcs11/ns1/named.conf.j2 index baaed133aa2..f3c1180cd4b 100644 --- a/bin/tests/system/enginepkcs11/ns1/named.conf.j2 +++ b/bin/tests/system/enginepkcs11/ns1/named.conf.j2 @@ -1,5 +1,3 @@ -controls { /* empty */ }; - options { query-source address 10.53.0.1; notify-source 10.53.0.1; @@ -13,14 +11,7 @@ options { notify no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key-store "hsm" { directory "."; diff --git a/bin/tests/system/expiredglue/ns1/named.conf.j2 b/bin/tests/system/expiredglue/ns1/named.conf.j2 index f7555355606..b81b2a50556 100644 --- a/bin/tests/system/expiredglue/ns1/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns1/named.conf.j2 @@ -16,11 +16,4 @@ view "default" { }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/expiredglue/ns2/named.conf.j2 b/bin/tests/system/expiredglue/ns2/named.conf.j2 index de0ea648177..af32dc46fd3 100644 --- a/bin/tests/system/expiredglue/ns2/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns2/named.conf.j2 @@ -14,11 +14,4 @@ zone "tld." { file "tld.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/expiredglue/ns3/named.conf.j2 b/bin/tests/system/expiredglue/ns3/named.conf.j2 index ff6f955577d..42408a9d6a2 100644 --- a/bin/tests/system/expiredglue/ns3/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns3/named.conf.j2 @@ -19,11 +19,4 @@ zone "example.tld." { file "example.tld.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/expiredglue/ns4/named.conf.j2 b/bin/tests/system/expiredglue/ns4/named.conf.j2 index bd18bbf02ac..88729c56598 100644 --- a/bin/tests/system/expiredglue/ns4/named.conf.j2 +++ b/bin/tests/system/expiredglue/ns4/named.conf.j2 @@ -14,11 +14,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.j2 b/bin/tests/system/fetchlimit/ns2/named.conf.j2 index eca1096e9e7..f85b068980a 100644 --- a/bin/tests/system/fetchlimit/ns2/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns2/named.conf.j2 @@ -11,14 +11,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { diff --git a/bin/tests/system/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2 index dfff5778cb3..5be01416320 100644 --- a/bin/tests/system/fetchlimit/ns3/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2 @@ -1,5 +1,3 @@ -controls { /* empty */ }; - options { query-source address 10.53.0.3; notify-source 10.53.0.3; @@ -20,14 +18,7 @@ server 10.53.0.4 { edns no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 index ec7649dc6fe..fe469059b4f 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 @@ -18,14 +18,7 @@ server 10.53.0.4 { edns no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 index ab61f8ec003..ad7b2b55519 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 @@ -18,14 +18,7 @@ server 10.53.0.4 { edns no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2 index 477ec11c833..252cb8b0006 100644 --- a/bin/tests/system/fetchlimit/ns5/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2 @@ -19,14 +19,7 @@ server 10.53.0.4 { edns no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 index c7603d870fe..793160e49dd 100644 --- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 @@ -22,14 +22,7 @@ server 10.53.0.4 { edns no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 index cdd923c21e3..019996ea6f1 100644 --- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 @@ -23,14 +23,7 @@ server 10.53.0.4 { edns no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/filters/ns1/named.conf.j2 b/bin/tests/system/filters/ns1/named.conf.j2 index 956b619b561..81534e6895e 100644 --- a/bin/tests/system/filters/ns1/named.conf.j2 +++ b/bin/tests/system/filters/ns1/named.conf.j2 @@ -29,14 +29,7 @@ options { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; file "root.db"; }; diff --git a/bin/tests/system/filters/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 index 1be883786da..5e6fa70fbc8 100644 --- a/bin/tests/system/filters/ns2/named.conf.j2 +++ b/bin/tests/system/filters/ns2/named.conf.j2 @@ -28,14 +28,7 @@ options { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/filters/ns3/named.conf.j2 b/bin/tests/system/filters/ns3/named.conf.j2 index eaf936dfb32..41e921d9750 100644 --- a/bin/tests/system/filters/ns3/named.conf.j2 +++ b/bin/tests/system/filters/ns3/named.conf.j2 @@ -28,14 +28,7 @@ options { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/filters/ns4/named.conf.j2 b/bin/tests/system/filters/ns4/named.conf.j2 index 767708b4989..79114238722 100644 --- a/bin/tests/system/filters/ns4/named.conf.j2 +++ b/bin/tests/system/filters/ns4/named.conf.j2 @@ -27,14 +27,7 @@ options { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; file "root.db"; }; diff --git a/bin/tests/system/filters/ns5/named.conf.j2 b/bin/tests/system/filters/ns5/named.conf.j2 index 523e3aca446..1a67e6c8f79 100644 --- a/bin/tests/system/filters/ns5/named.conf.j2 +++ b/bin/tests/system/filters/ns5/named.conf.j2 @@ -22,14 +22,7 @@ plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" { filter-aaaa { any; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/forward/ns3/named.conf.j2 b/bin/tests/system/forward/ns3/named.conf.j2 index f342b3c98e7..ba8880c0eb0 100644 --- a/bin/tests/system/forward/ns3/named.conf.j2 +++ b/bin/tests/system/forward/ns3/named.conf.j2 @@ -15,14 +15,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/forward/ns3/named2.conf.j2 b/bin/tests/system/forward/ns3/named2.conf.j2 index 4db8961b5a4..117ab49e3ab 100644 --- a/bin/tests/system/forward/ns3/named2.conf.j2 +++ b/bin/tests/system/forward/ns3/named2.conf.j2 @@ -15,14 +15,7 @@ options { include "trusted.conf"; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/forward/ns9/named.conf.j2 b/bin/tests/system/forward/ns9/named.conf.j2 index fa26a906339..f481a351e5c 100644 --- a/bin/tests/system/forward/ns9/named.conf.j2 +++ b/bin/tests/system/forward/ns9/named.conf.j2 @@ -10,14 +10,7 @@ options { edns-udp-size 1232; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server 10.53.0.10 { edns no; diff --git a/bin/tests/system/forward/ns9/named2.conf.j2 b/bin/tests/system/forward/ns9/named2.conf.j2 index 16004292ea1..2649ddc11d1 100644 --- a/bin/tests/system/forward/ns9/named2.conf.j2 +++ b/bin/tests/system/forward/ns9/named2.conf.j2 @@ -10,14 +10,7 @@ options { edns-udp-size 1232; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server 10.53.0.10 { edns no; diff --git a/bin/tests/system/forward/ns9/named3.conf.j2 b/bin/tests/system/forward/ns9/named3.conf.j2 index 44afcbcfee8..cd91ad737b4 100644 --- a/bin/tests/system/forward/ns9/named3.conf.j2 +++ b/bin/tests/system/forward/ns9/named3.conf.j2 @@ -12,14 +12,7 @@ options { forwarders { 10.53.0.10; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server 10.53.0.10 { edns no; diff --git a/bin/tests/system/forward/ns9/named4.conf.j2 b/bin/tests/system/forward/ns9/named4.conf.j2 index 494e0ee98b0..a5c5ccaccdd 100644 --- a/bin/tests/system/forward/ns9/named4.conf.j2 +++ b/bin/tests/system/forward/ns9/named4.conf.j2 @@ -10,14 +10,7 @@ options { edns-udp-size 1232; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server 10.53.0.10 { edns no; diff --git a/bin/tests/system/geoip2/ns2/named.conf.j2 b/bin/tests/system/geoip2/ns2/named.conf.j2 index 76fd51e59ac..b4a00609575 100644 --- a/bin/tests/system/geoip2/ns2/named.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip db country country AU; }; diff --git a/bin/tests/system/geoip2/ns2/named10.conf.j2 b/bin/tests/system/geoip2/ns2/named10.conf.j2 index e1788f60517..f1b6623d95a 100644 --- a/bin/tests/system/geoip2/ns2/named10.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named10.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip asnum 100001; }; diff --git a/bin/tests/system/geoip2/ns2/named11.conf.j2 b/bin/tests/system/geoip2/ns2/named11.conf.j2 index 87c592d0b9d..19688de9f85 100644 --- a/bin/tests/system/geoip2/ns2/named11.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named11.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip domain one.de; }; diff --git a/bin/tests/system/geoip2/ns2/named12.conf.j2 b/bin/tests/system/geoip2/ns2/named12.conf.j2 index b57dcf67e65..86abf2115ba 100644 --- a/bin/tests/system/geoip2/ns2/named12.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named12.conf.j2 @@ -18,11 +18,4 @@ options { blackhole { blocking; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/geoip2/ns2/named2.conf.j2 b/bin/tests/system/geoip2/ns2/named2.conf.j2 index 3d8269422f5..1261c663cea 100644 --- a/bin/tests/system/geoip2/ns2/named2.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named2.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} acl gAU { geoip db country country AU; }; acl gUS { geoip db country country US; }; diff --git a/bin/tests/system/geoip2/ns2/named3.conf.j2 b/bin/tests/system/geoip2/ns2/named3.conf.j2 index 2fcb3177675..63c824dad59 100644 --- a/bin/tests/system/geoip2/ns2/named3.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named3.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip db country country Australia; }; diff --git a/bin/tests/system/geoip2/ns2/named4.conf.j2 b/bin/tests/system/geoip2/ns2/named4.conf.j2 index 677213047dd..39cb149a0c4 100644 --- a/bin/tests/system/geoip2/ns2/named4.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named4.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip db country continent OC; }; diff --git a/bin/tests/system/geoip2/ns2/named5.conf.j2 b/bin/tests/system/geoip2/ns2/named5.conf.j2 index 9e389ce2def..fd8e22e0264 100644 --- a/bin/tests/system/geoip2/ns2/named5.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named5.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip region CA; }; diff --git a/bin/tests/system/geoip2/ns2/named6.conf.j2 b/bin/tests/system/geoip2/ns2/named6.conf.j2 index ec9d3a10636..e76813bf311 100644 --- a/bin/tests/system/geoip2/ns2/named6.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named6.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip city "Redwood City"; }; diff --git a/bin/tests/system/geoip2/ns2/named7.conf.j2 b/bin/tests/system/geoip2/ns2/named7.conf.j2 index eac8aa4e262..6a57790d69d 100644 --- a/bin/tests/system/geoip2/ns2/named7.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named7.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip isp "One Systems, Inc."; }; diff --git a/bin/tests/system/geoip2/ns2/named8.conf.j2 b/bin/tests/system/geoip2/ns2/named8.conf.j2 index 73873f28020..c8654044759 100644 --- a/bin/tests/system/geoip2/ns2/named8.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named8.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip org "One Systems, Inc."; }; diff --git a/bin/tests/system/geoip2/ns2/named9.conf.j2 b/bin/tests/system/geoip2/ns2/named9.conf.j2 index 13d07713287..8220006e3ca 100644 --- a/bin/tests/system/geoip2/ns2/named9.conf.j2 +++ b/bin/tests/system/geoip2/ns2/named9.conf.j2 @@ -13,14 +13,7 @@ options { geoip-directory "../data"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view one { match-clients { geoip asnum "AS100001"; }; diff --git a/bin/tests/system/gluecache/ns1/named.conf.j2 b/bin/tests/system/gluecache/ns1/named.conf.j2 index 8271d9bcb4c..0925df31b6e 100644 --- a/bin/tests/system/gluecache/ns1/named.conf.j2 +++ b/bin/tests/system/gluecache/ns1/named.conf.j2 @@ -16,11 +16,4 @@ zone "example" { file "example.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/hooks/ns1/named.conf.j2 b/bin/tests/system/hooks/ns1/named.conf.j2 index 45f9356584b..65d0dc2334d 100644 --- a/bin/tests/system/hooks/ns1/named.conf.j2 +++ b/bin/tests/system/hooks/ns1/named.conf.j2 @@ -19,14 +19,7 @@ plugin query "@TOP_BUILDDIR@/testlib-driver-async"; plugin query "@TOP_BUILDDIR@/testlib-driver-async.@DYLIB@"; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example.com" { type primary; diff --git a/bin/tests/system/hooks/ns2/named.conf.j2 b/bin/tests/system/hooks/ns2/named.conf.j2 index 64908b9b313..68e885b5bc4 100644 --- a/bin/tests/system/hooks/ns2/named.conf.j2 +++ b/bin/tests/system/hooks/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { trust-anchors { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} plugin query "@TOP_BUILDDIR@/testlib-driver-syncplugin" { rcode noerror; diff --git a/bin/tests/system/ixfr/ns1/named.conf.j2 b/bin/tests/system/ixfr/ns1/named.conf.j2 index 283cd83d017..d9808cfc692 100644 --- a/bin/tests/system/ixfr/ns1/named.conf.j2 +++ b/bin/tests/system/ixfr/ns1/named.conf.j2 @@ -12,11 +12,4 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/ixfr/ns3/named.conf.j2 b/bin/tests/system/ixfr/ns3/named.conf.j2 index 6234c4e48d7..fe940bd24af 100644 --- a/bin/tests/system/ixfr/ns3/named.conf.j2 +++ b/bin/tests/system/ixfr/ns3/named.conf.j2 @@ -12,14 +12,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view "primary" { ixfr-from-differences yes; diff --git a/bin/tests/system/ixfr/ns4/named.conf.j2 b/bin/tests/system/ixfr/ns4/named.conf.j2 index 3be7e4f4b5a..6a7c8cc9065 100644 --- a/bin/tests/system/ixfr/ns4/named.conf.j2 +++ b/bin/tests/system/ixfr/ns4/named.conf.j2 @@ -12,14 +12,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view "primary" { ixfr-from-differences yes; diff --git a/bin/tests/system/ixfr/ns5/named.conf.j2 b/bin/tests/system/ixfr/ns5/named.conf.j2 index 42adb02fd78..5e8dafa626b 100644 --- a/bin/tests/system/ixfr/ns5/named.conf.j2 +++ b/bin/tests/system/ixfr/ns5/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view "primary" { ixfr-from-differences yes; diff --git a/bin/tests/system/journal/ns1/named.conf.j2 b/bin/tests/system/journal/ns1/named.conf.j2 index 7393a4c96c5..2390c495a71 100644 --- a/bin/tests/system/journal/ns1/named.conf.j2 +++ b/bin/tests/system/journal/ns1/named.conf.j2 @@ -13,14 +13,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone . { type hint; diff --git a/bin/tests/system/journal/ns2/named.conf.j2 b/bin/tests/system/journal/ns2/named.conf.j2 index 389992ebbe3..6d7daf1ad11 100644 --- a/bin/tests/system/journal/ns2/named.conf.j2 +++ b/bin/tests/system/journal/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone . { type hint; diff --git a/bin/tests/system/kasp/ns2/named.conf.j2 b/bin/tests/system/kasp/ns2/named.conf.j2 index 454e90398c1..d6b5e93f4fc 100644 --- a/bin/tests/system/kasp/ns2/named.conf.j2 +++ b/bin/tests/system/kasp/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} /* Inherit dnssec-policy (which is none) */ diff --git a/bin/tests/system/kasp/ns3/named-common.conf.j2 b/bin/tests/system/kasp/ns3/named-common.conf.j2 index 73ecbe5503d..cf5b063a2a3 100644 --- a/bin/tests/system/kasp/ns3/named-common.conf.j2 +++ b/bin/tests/system/kasp/ns3/named-common.conf.j2 @@ -14,14 +14,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/kasp/ns4/named.conf.j2 b/bin/tests/system/kasp/ns4/named.conf.j2 index cea5327746a..f0db7e20d2b 100644 --- a/bin/tests/system/kasp/ns4/named.conf.j2 +++ b/bin/tests/system/kasp/ns4/named.conf.j2 @@ -2,14 +2,7 @@ include "purgekeys.conf"; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key "sha1" { algorithm "hmac-sha1"; diff --git a/bin/tests/system/kasp/ns5/named.conf.j2 b/bin/tests/system/kasp/ns5/named.conf.j2 index 168e2c3a651..1d819e3465f 100644 --- a/bin/tests/system/kasp/ns5/named.conf.j2 +++ b/bin/tests/system/kasp/ns5/named.conf.j2 @@ -1,13 +1,6 @@ // NS5 -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key "sha1" { algorithm "hmac-sha1"; diff --git a/bin/tests/system/kasp/ns6/named.conf.j2 b/bin/tests/system/kasp/ns6/named.conf.j2 index b3d78eb5bee..e77a9ddf5b1 100644 --- a/bin/tests/system/kasp/ns6/named.conf.j2 +++ b/bin/tests/system/kasp/ns6/named.conf.j2 @@ -17,14 +17,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/keepalive/ns1/named.conf.j2 b/bin/tests/system/keepalive/ns1/named.conf.j2 index f712abd61ec..9c0ed7e16e3 100644 --- a/bin/tests/system/keepalive/ns1/named.conf.j2 +++ b/bin/tests/system/keepalive/ns1/named.conf.j2 @@ -11,14 +11,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/keepalive/ns2/named.conf.j2 b/bin/tests/system/keepalive/ns2/named.conf.j2 index 80cd9e75c3c..312a7e6bb98 100644 --- a/bin/tests/system/keepalive/ns2/named.conf.j2 +++ b/bin/tests/system/keepalive/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2 index 6ae9a19617e..d1529c4bde8 100644 --- a/bin/tests/system/keepalive/ns3/named.conf.j2 +++ b/bin/tests/system/keepalive/ns3/named.conf.j2 @@ -17,14 +17,7 @@ server 10.53.0.2 { tcp-keepalive yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/ksr/ns1/named.conf.j2 b/bin/tests/system/ksr/ns1/named.conf.j2 index 0fb2df4fba8..b0f3c8706eb 100644 --- a/bin/tests/system/ksr/ns1/named.conf.j2 +++ b/bin/tests/system/ksr/ns1/named.conf.j2 @@ -12,14 +12,7 @@ options { allow-new-zones yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "common" { offline-ksk yes; diff --git a/bin/tests/system/legacy/ns1/named.conf.j2 b/bin/tests/system/legacy/ns1/named.conf.j2 index 5c8683cffa1..047939d50d4 100644 --- a/bin/tests/system/legacy/ns1/named.conf.j2 +++ b/bin/tests/system/legacy/ns1/named.conf.j2 @@ -13,14 +13,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 index c4012761adb..5bccc24571b 100644 --- a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 @@ -29,11 +29,4 @@ logging { category queries { query_log; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm hmac-sha256; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 index c9a623908d6..540f7c6c7e3 100644 --- a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 @@ -20,11 +20,4 @@ logging { category lame-servers { null; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 index 5d567978855..1e79c7e251b 100644 --- a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 @@ -29,11 +29,4 @@ logging { category queries { query_log; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm hmac-sha256; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 index 441c1088bba..b4100057bc7 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 @@ -20,11 +20,4 @@ logging { category default { default_log; default_debug; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 index 44e57447967..dce68370518 100644 --- a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 @@ -21,11 +21,4 @@ logging { }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 index 9a45348ef9c..373109c09a6 100644 --- a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 @@ -20,11 +20,4 @@ logging { category lame-servers { null; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 index 772d55e6e2f..3d878ae6517 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 @@ -27,11 +27,4 @@ logging { category queries { query_log; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 index 9d21cfcc636..127f6c6624d 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 @@ -11,11 +11,4 @@ options { notify yes; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 index 71c1949938f..19f85e49b5e 100644 --- a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 @@ -20,11 +20,4 @@ logging { category lame-servers { null; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 index 0564133be66..fc0dc2e1abd 100644 --- a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 @@ -29,11 +29,4 @@ logging { category queries { query_log; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 index f6760d66649..1193fd99c3e 100644 --- a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 @@ -29,11 +29,4 @@ logging { category queries { query_log; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 index 57573905078..011fb6fe4b0 100644 --- a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 +++ b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 @@ -29,11 +29,4 @@ logging { category queries { query_log; }; }; -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { "rndc-key"; }; -}; - -key rndc-key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/masterformat/ns1/named.conf.j2 b/bin/tests/system/masterformat/ns1/named.conf.j2 index daadc33b785..e6a350a5d48 100644 --- a/bin/tests/system/masterformat/ns1/named.conf.j2 +++ b/bin/tests/system/masterformat/ns1/named.conf.j2 @@ -14,14 +14,7 @@ options { max-types-per-name 500; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "masterformat" { keys { diff --git a/bin/tests/system/masterformat/ns3/named.conf.j2 b/bin/tests/system/masterformat/ns3/named.conf.j2 index 55fe0bc5dfa..ed7292cc05e 100644 --- a/bin/tests/system/masterformat/ns3/named.conf.j2 +++ b/bin/tests/system/masterformat/ns3/named.conf.j2 @@ -10,14 +10,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type primary; diff --git a/bin/tests/system/masterformat/ns4/named.conf.j2 b/bin/tests/system/masterformat/ns4/named.conf.j2 index 69a0a1c1f1d..df1039d21af 100644 --- a/bin/tests/system/masterformat/ns4/named.conf.j2 +++ b/bin/tests/system/masterformat/ns4/named.conf.j2 @@ -16,14 +16,7 @@ options { max-types-per-name 11; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "masterformat" { keys { diff --git a/bin/tests/system/masterformat/ns4/named2.conf.j2 b/bin/tests/system/masterformat/ns4/named2.conf.j2 index fd1f8b4058e..a5ff9d35b36 100644 --- a/bin/tests/system/masterformat/ns4/named2.conf.j2 +++ b/bin/tests/system/masterformat/ns4/named2.conf.j2 @@ -16,14 +16,7 @@ options { max-types-per-name 9; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} /* * The template zone is fine, but when adding the DNSSEC records to the apex, diff --git a/bin/tests/system/migrate2kasp/ns3/named.conf.j2 b/bin/tests/system/migrate2kasp/ns3/named.conf.j2 index d520667c4aa..a78c1c5dc46 100644 --- a/bin/tests/system/migrate2kasp/ns3/named.conf.j2 +++ b/bin/tests/system/migrate2kasp/ns3/named.conf.j2 @@ -15,14 +15,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} /* These are zones that migrate to dnssec-policy. */ zone "migrate.kasp" { diff --git a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 b/bin/tests/system/migrate2kasp/ns4/named.conf.j2 index d67cf24ee5e..2c4c9623061 100644 --- a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 +++ b/bin/tests/system/migrate2kasp/ns4/named.conf.j2 @@ -14,14 +14,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "rsasha256" { keys { diff --git a/bin/tests/system/minimalresponses/ns1/named.conf.j2 b/bin/tests/system/minimalresponses/ns1/named.conf.j2 index f4ff1f5a944..a5621430562 100644 --- a/bin/tests/system/minimalresponses/ns1/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns1/named.conf.j2 @@ -18,11 +18,4 @@ zone "." { file "root.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/minimalresponses/ns2/named.conf.j2 b/bin/tests/system/minimalresponses/ns2/named.conf.j2 index 3869e53b8d9..22fd505ff75 100644 --- a/bin/tests/system/minimalresponses/ns2/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { minimal-responses @minresp@; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example2" { type primary; diff --git a/bin/tests/system/minimalresponses/ns3/named.conf.j2 b/bin/tests/system/minimalresponses/ns3/named.conf.j2 index fb2ee8fc9b8..ddb8c4c7212 100644 --- a/bin/tests/system/minimalresponses/ns3/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns3/named.conf.j2 @@ -14,14 +14,7 @@ options { minimal-responses @minresp@; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/minimalresponses/ns4/named.conf.j2 b/bin/tests/system/minimalresponses/ns4/named.conf.j2 index 05b6c304cde..75c52c18e98 100644 --- a/bin/tests/system/minimalresponses/ns4/named.conf.j2 +++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2 @@ -14,14 +14,7 @@ options { minimal-responses @minresp@; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/mirror/ns2/named.conf.j2 b/bin/tests/system/mirror/ns2/named.conf.j2 index 4cb462d883b..2d82ba105c0 100644 --- a/bin/tests/system/mirror/ns2/named.conf.j2 +++ b/bin/tests/system/mirror/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/mirror/ns3/named.conf.j2 b/bin/tests/system/mirror/ns3/named.conf.j2 index 28fef4193c9..856ff159c74 100644 --- a/bin/tests/system/mirror/ns3/named.conf.j2 +++ b/bin/tests/system/mirror/ns3/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/mirror_root_zone/ns1/named.conf.j2 b/bin/tests/system/mirror_root_zone/ns1/named.conf.j2 index 6bdda598d1d..ed126e55d8c 100644 --- a/bin/tests/system/mirror_root_zone/ns1/named.conf.j2 +++ b/bin/tests/system/mirror_root_zone/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { pid-file "named.pid"; diff --git a/bin/tests/system/mkeys/ns1/named.conf.j2 b/bin/tests/system/mkeys/ns1/named.conf.j2 index 1b30bfd8aaf..6da24a56d38 100644 --- a/bin/tests/system/mkeys/ns1/named.conf.j2 +++ b/bin/tests/system/mkeys/ns1/named.conf.j2 @@ -20,14 +20,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/mkeys/ns1/named2.conf.j2 b/bin/tests/system/mkeys/ns1/named2.conf.j2 index 1b30bfd8aaf..6da24a56d38 100644 --- a/bin/tests/system/mkeys/ns1/named2.conf.j2 +++ b/bin/tests/system/mkeys/ns1/named2.conf.j2 @@ -20,14 +20,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/mkeys/ns1/named3.conf.j2 b/bin/tests/system/mkeys/ns1/named3.conf.j2 index b8c38524030..ab3ec88ff96 100644 --- a/bin/tests/system/mkeys/ns1/named3.conf.j2 +++ b/bin/tests/system/mkeys/ns1/named3.conf.j2 @@ -14,14 +14,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/mkeys/ns2/named.conf.j2 b/bin/tests/system/mkeys/ns2/named.conf.j2 index 88848469808..49094ff4c01 100644 --- a/bin/tests/system/mkeys/ns2/named.conf.j2 +++ b/bin/tests/system/mkeys/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { servfail-ttl 0; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/mkeys/ns3/named.conf.j2 b/bin/tests/system/mkeys/ns3/named.conf.j2 index fe1c21eb53e..5792db204c4 100644 --- a/bin/tests/system/mkeys/ns3/named.conf.j2 +++ b/bin/tests/system/mkeys/ns3/named.conf.j2 @@ -14,14 +14,7 @@ options { trust-anchor-telemetry no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/mkeys/ns4/named.conf.j2 b/bin/tests/system/mkeys/ns4/named.conf.j2 index 56787c0e354..0ca44cca501 100644 --- a/bin/tests/system/mkeys/ns4/named.conf.j2 +++ b/bin/tests/system/mkeys/ns4/named.conf.j2 @@ -14,14 +14,7 @@ options { managed-keys-directory "nope"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/mkeys/ns5/named.conf.j2 b/bin/tests/system/mkeys/ns5/named.conf.j2 index 0b5f28b1c5b..6795dc2686d 100644 --- a/bin/tests/system/mkeys/ns5/named.conf.j2 +++ b/bin/tests/system/mkeys/ns5/named.conf.j2 @@ -14,14 +14,7 @@ options { servfail-ttl 0; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/mkeys/ns6/named.conf.j2 b/bin/tests/system/mkeys/ns6/named.conf.j2 index eefc8a54b4d..b8b99665fa6 100644 --- a/bin/tests/system/mkeys/ns6/named.conf.j2 +++ b/bin/tests/system/mkeys/ns6/named.conf.j2 @@ -14,14 +14,7 @@ options { trust-anchor-telemetry no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/mkeys/ns7/named.conf.j2 b/bin/tests/system/mkeys/ns7/named.conf.j2 index f08888821cb..e17d5ea732f 100644 --- a/bin/tests/system/mkeys/ns7/named.conf.j2 +++ b/bin/tests/system/mkeys/ns7/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation auto; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view view1 { zone "." { diff --git a/bin/tests/system/multisigner/ns2/named.conf.j2 b/bin/tests/system/multisigner/ns2/named.conf.j2 index d90567dff45..95cd4a70aee 100644 --- a/bin/tests/system/multisigner/ns2/named.conf.j2 +++ b/bin/tests/system/multisigner/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "multisigner" { type primary; diff --git a/bin/tests/system/multisigner/ns3/named.conf.j2 b/bin/tests/system/multisigner/ns3/named.conf.j2 index a7f2546cb59..40bf9bd1e44 100644 --- a/bin/tests/system/multisigner/ns3/named.conf.j2 +++ b/bin/tests/system/multisigner/ns3/named.conf.j2 @@ -16,14 +16,7 @@ options { notify-cfg CDS { notify yes; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "model2.multisigner." { type primary; diff --git a/bin/tests/system/multisigner/ns4/named.conf.j2 b/bin/tests/system/multisigner/ns4/named.conf.j2 index cc73f37179e..d72bdec0051 100644 --- a/bin/tests/system/multisigner/ns4/named.conf.j2 +++ b/bin/tests/system/multisigner/ns4/named.conf.j2 @@ -16,14 +16,7 @@ options { notify-cfg cds { notify yes; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "model2.multisigner." { type primary; diff --git a/bin/tests/system/multisigner/ns5/named.conf.j2 b/bin/tests/system/multisigner/ns5/named.conf.j2 index 10da5a0272f..dffde83ad8b 100644 --- a/bin/tests/system/multisigner/ns5/named.conf.j2 +++ b/bin/tests/system/multisigner/ns5/named.conf.j2 @@ -16,14 +16,7 @@ options { notify-delay 0; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "model2.secondary." { type primary; diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2 index 03908b23378..3a1e738d8b2 100644 --- a/bin/tests/system/notify/ns2/named.conf.j2 +++ b/bin/tests/system/notify/ns2/named.conf.j2 @@ -27,14 +27,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/nsec3/ns2/named.conf.j2 b/bin/tests/system/nsec3/ns2/named.conf.j2 index 2bf4b817cff..a1195e9e663 100644 --- a/bin/tests/system/nsec3/ns2/named.conf.j2 +++ b/bin/tests/system/nsec3/ns2/named.conf.j2 @@ -17,14 +17,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if "nsec3-xfr-inline.kasp" in zones %} zone "nsec3-xfr-inline.kasp" { diff --git a/bin/tests/system/nsec3/ns3/named-common.conf.j2 b/bin/tests/system/nsec3/ns3/named-common.conf.j2 index 16ddd58b10f..9e980b4e2b3 100644 --- a/bin/tests/system/nsec3/ns3/named-common.conf.j2 +++ b/bin/tests/system/nsec3/ns3/named-common.conf.j2 @@ -11,14 +11,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "nsec" { // no need to change configuration: if no 'nsec3param' is set, diff --git a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 index 560580b65d2..7604769f092 100644 --- a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 +++ b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 index abdf03cc333..0e857c9d16d 100644 --- a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 index c3a7e0d7eb2..85e37ab8099 100644 --- a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 +++ b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 @@ -15,14 +15,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "c.p22.hack" { type primary; diff --git a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 index 09fbdd4e702..543c5a08ef6 100644 --- a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 +++ b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 @@ -49,11 +49,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 index f7555355606..b81b2a50556 100644 --- a/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 @@ -16,11 +16,4 @@ view "default" { }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 index de0ea648177..af32dc46fd3 100644 --- a/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 @@ -14,11 +14,4 @@ zone "tld." { file "tld.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 index b3b3912916b..7a1cc54d9ee 100644 --- a/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 @@ -14,11 +14,4 @@ zone "example.tld." { file "example.tld.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 index 4cdca1c48cb..4885b240d36 100644 --- a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 +++ b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 @@ -21,11 +21,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/nsupdate/ns1/named.conf.j2 b/bin/tests/system/nsupdate/ns1/named.conf.j2 index 3c0e06879fc..22b697ce5bf 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns1/named.conf.j2 @@ -31,14 +31,7 @@ acl named-acl { any; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key altkey { algorithm @DEFAULT_HMAC@; diff --git a/bin/tests/system/nsupdate/ns10/named.conf.j2 b/bin/tests/system/nsupdate/ns10/named.conf.j2 index 1b3b467be4b..467c35edb4d 100644 --- a/bin/tests/system/nsupdate/ns10/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns10/named.conf.j2 @@ -16,14 +16,7 @@ options { tkey-gssapi-keytab "dns.keytab"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.10 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "in-addr.arpa" { type primary; diff --git a/bin/tests/system/nsupdate/ns2/named.conf.j2 b/bin/tests/system/nsupdate/ns2/named.conf.j2 index 784c62816e7..e28dd033088 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns2/named.conf.j2 @@ -12,14 +12,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key altkey { algorithm @DEFAULT_HMAC@; diff --git a/bin/tests/system/nsupdate/ns3/named.conf.j2 b/bin/tests/system/nsupdate/ns3/named.conf.j2 index fd3f4d50520..3111c03f96a 100644 --- a/bin/tests/system/nsupdate/ns3/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns3/named.conf.j2 @@ -14,14 +14,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/nsupdate/ns5/named.conf.j2 b/bin/tests/system/nsupdate/ns5/named.conf.j2 index 5f902f0624c..8115eac5d12 100644 --- a/bin/tests/system/nsupdate/ns5/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns5/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "local.nil" { type primary; diff --git a/bin/tests/system/nsupdate/ns6/named.conf.j2 b/bin/tests/system/nsupdate/ns6/named.conf.j2 index 808bba4bb73..d8fe3293ab3 100644 --- a/bin/tests/system/nsupdate/ns6/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns6/named.conf.j2 @@ -16,14 +16,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "in-addr.arpa" { type primary; diff --git a/bin/tests/system/nsupdate/ns7/named.conf.j2 b/bin/tests/system/nsupdate/ns7/named.conf.j2 index 1ba33a6623b..72a46df764e 100644 --- a/bin/tests/system/nsupdate/ns7/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns7/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "in-addr.arpa" { type primary; diff --git a/bin/tests/system/nsupdate/ns7/named2.conf.j2 b/bin/tests/system/nsupdate/ns7/named2.conf.j2 index 13f1bf8911d..930013bb766 100644 --- a/bin/tests/system/nsupdate/ns7/named2.conf.j2 +++ b/bin/tests/system/nsupdate/ns7/named2.conf.j2 @@ -14,14 +14,7 @@ options { tkey-gssapi-keytab "dns.keytab"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "in-addr.arpa" { type primary; diff --git a/bin/tests/system/nsupdate/ns8/named.conf.j2 b/bin/tests/system/nsupdate/ns8/named.conf.j2 index c259ec13165..bf3d1329665 100644 --- a/bin/tests/system/nsupdate/ns8/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns8/named.conf.j2 @@ -14,14 +14,7 @@ options { tkey-gssapi-keytab "dns-other-than-KRB5_KTNAME.keytab"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "in-addr.arpa" { type primary; diff --git a/bin/tests/system/nsupdate/ns9/named.conf.j2 b/bin/tests/system/nsupdate/ns9/named.conf.j2 index fd0613509b1..a615322e23e 100644 --- a/bin/tests/system/nsupdate/ns9/named.conf.j2 +++ b/bin/tests/system/nsupdate/ns9/named.conf.j2 @@ -14,19 +14,12 @@ options { tkey-gssapi-keytab "dns.keytab"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - key subkey { secret "1234abcd8765"; algorithm @DEFAULT_HMAC@; }; -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "in-addr.arpa" { type primary; diff --git a/bin/tests/system/nta/ns2/named.conf.j2 b/bin/tests/system/nta/ns2/named.conf.j2 index 9869605b97f..848524e21e9 100644 --- a/bin/tests/system/nta/ns2/named.conf.j2 +++ b/bin/tests/system/nta/ns2/named.conf.j2 @@ -16,14 +16,7 @@ options { minimal-responses no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type primary; diff --git a/bin/tests/system/nta/ns3/named.conf.j2 b/bin/tests/system/nta/ns3/named.conf.j2 index 6643fc470a9..a1359acc916 100644 --- a/bin/tests/system/nta/ns3/named.conf.j2 +++ b/bin/tests/system/nta/ns3/named.conf.j2 @@ -15,14 +15,7 @@ options { minimal-responses no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type secondary; diff --git a/bin/tests/system/nta/ns4/named.conf.j2 b/bin/tests/system/nta/ns4/named.conf.j2 index 525c01a1fe5..d6557e83f1c 100644 --- a/bin/tests/system/nta/ns4/named.conf.j2 +++ b/bin/tests/system/nta/ns4/named.conf.j2 @@ -20,14 +20,7 @@ options { include "trusted.conf"; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/nta/ns9/named.conf.j2 b/bin/tests/system/nta/ns9/named.conf.j2 index 4323bebe3da..c993f22f25d 100644 --- a/bin/tests/system/nta/ns9/named.conf.j2 +++ b/bin/tests/system/nta/ns9/named.conf.j2 @@ -15,13 +15,6 @@ options { servfail-ttl 0; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "trusted.conf"; diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.j2 b/bin/tests/system/nzd2nzf/ns1/named.conf.j2 index 005de1d0f37..f9ee45fbc90 100644 --- a/bin/tests/system/nzd2nzf/ns1/named.conf.j2 +++ b/bin/tests/system/nzd2nzf/ns1/named.conf.j2 @@ -9,11 +9,4 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/padding/ns1/named.conf.j2 b/bin/tests/system/padding/ns1/named.conf.j2 index f712abd61ec..9c0ed7e16e3 100644 --- a/bin/tests/system/padding/ns1/named.conf.j2 +++ b/bin/tests/system/padding/ns1/named.conf.j2 @@ -11,14 +11,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/padding/ns2/named.conf.j2 b/bin/tests/system/padding/ns2/named.conf.j2 index 49322e3fdee..49d3059ec29 100644 --- a/bin/tests/system/padding/ns2/named.conf.j2 +++ b/bin/tests/system/padding/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2 index 0f34aa66fce..60a273eccce 100644 --- a/bin/tests/system/padding/ns3/named.conf.j2 +++ b/bin/tests/system/padding/ns3/named.conf.j2 @@ -17,14 +17,7 @@ server 10.53.0.2 { padding 64; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2 index 5d9a0104319..099ac4a7aba 100644 --- a/bin/tests/system/padding/ns4/named.conf.j2 +++ b/bin/tests/system/padding/ns4/named.conf.j2 @@ -17,14 +17,7 @@ server 10.53.0.2 { padding 64; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/pipelined/ns1/named.conf.j2 b/bin/tests/system/pipelined/ns1/named.conf.j2 index 7ee2e8f7596..8d7b125a0c7 100644 --- a/bin/tests/system/pipelined/ns1/named.conf.j2 +++ b/bin/tests/system/pipelined/ns1/named.conf.j2 @@ -11,14 +11,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2 index dc4d8f30185..e3a578e805d 100644 --- a/bin/tests/system/pipelined/ns2/named.conf.j2 +++ b/bin/tests/system/pipelined/ns2/named.conf.j2 @@ -12,14 +12,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2 index 62451c4f1ee..3a8d312dfcf 100644 --- a/bin/tests/system/pipelined/ns3/named.conf.j2 +++ b/bin/tests/system/pipelined/ns3/named.conf.j2 @@ -12,14 +12,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2 index 1a9623e0f92..d453fce291c 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.j2 +++ b/bin/tests/system/pipelined/ns4/named.conf.j2 @@ -13,14 +13,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/qmin/ns5/named.conf.j2 b/bin/tests/system/qmin/ns5/named.conf.j2 index 3b536d05f6f..c4629e0b7d7 100644 --- a/bin/tests/system/qmin/ns5/named.conf.j2 +++ b/bin/tests/system/qmin/ns5/named.conf.j2 @@ -21,14 +21,7 @@ options { min-delegation-ttl 1; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/qmin/ns6/named.conf.j2 b/bin/tests/system/qmin/ns6/named.conf.j2 index 4d179a1b606..8fd0a1628b8 100644 --- a/bin/tests/system/qmin/ns6/named.conf.j2 +++ b/bin/tests/system/qmin/ns6/named.conf.j2 @@ -15,14 +15,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/qmin/ns7/named.conf.j2 b/bin/tests/system/qmin/ns7/named.conf.j2 index 49718108cde..5609ba0ee13 100644 --- a/bin/tests/system/qmin/ns7/named.conf.j2 +++ b/bin/tests/system/qmin/ns7/named.conf.j2 @@ -16,14 +16,7 @@ options { disable-empty-zone 10.in-addr.arpa; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 index 98e02cb2c95..f6b0c88efb7 100644 --- a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 +++ b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2 @@ -11,14 +11,7 @@ * information regarding copyright ownership. */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/query_source/ns1/named.conf.j2 b/bin/tests/system/query_source/ns1/named.conf.j2 index c677957136e..0bca7e895be 100644 --- a/bin/tests/system/query_source/ns1/named.conf.j2 +++ b/bin/tests/system/query_source/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/query_source/ns2/named.conf.j2 b/bin/tests/system/query_source/ns2/named.conf.j2 index e983730e511..93622283dc7 100644 --- a/bin/tests/system/query_source/ns2/named.conf.j2 +++ b/bin/tests/system/query_source/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/query_source/ns3/named.conf.j2 b/bin/tests/system/query_source/ns3/named.conf.j2 index c465f793939..fd53f119f89 100644 --- a/bin/tests/system/query_source/ns3/named.conf.j2 +++ b/bin/tests/system/query_source/ns3/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/query_source/ns4/named.conf.j2 b/bin/tests/system/query_source/ns4/named.conf.j2 index da1f66b96c9..f3fa76a0aa7 100644 --- a/bin/tests/system/query_source/ns4/named.conf.j2 +++ b/bin/tests/system/query_source/ns4/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/query_source/ns5/named.conf.j2 b/bin/tests/system/query_source/ns5/named.conf.j2 index 2431b9ac64e..e21c98fccb2 100644 --- a/bin/tests/system/query_source/ns5/named.conf.j2 +++ b/bin/tests/system/query_source/ns5/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/randomizens/ns2/named.conf.j2 b/bin/tests/system/randomizens/ns2/named.conf.j2 index d8f216cc68a..914a589b129 100644 --- a/bin/tests/system/randomizens/ns2/named.conf.j2 +++ b/bin/tests/system/randomizens/ns2/named.conf.j2 @@ -10,14 +10,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type primary; diff --git a/bin/tests/system/randomizens/ns3/named.conf.j2 b/bin/tests/system/randomizens/ns3/named.conf.j2 index 9bbf6092c24..95fdb19ac96 100644 --- a/bin/tests/system/randomizens/ns3/named.conf.j2 +++ b/bin/tests/system/randomizens/ns3/named.conf.j2 @@ -10,14 +10,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "1st" { type primary; diff --git a/bin/tests/system/randomizens/ns4/named.conf.j2 b/bin/tests/system/randomizens/ns4/named.conf.j2 index fea6e2a639d..279b45e6896 100644 --- a/bin/tests/system/randomizens/ns4/named.conf.j2 +++ b/bin/tests/system/randomizens/ns4/named.conf.j2 @@ -10,14 +10,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type primary; diff --git a/bin/tests/system/randomizens/ns5/named.conf.j2 b/bin/tests/system/randomizens/ns5/named.conf.j2 index f7e855855c2..e7d0d370123 100644 --- a/bin/tests/system/randomizens/ns5/named.conf.j2 +++ b/bin/tests/system/randomizens/ns5/named.conf.j2 @@ -10,14 +10,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "1st" { type primary; diff --git a/bin/tests/system/randomizens/ns6/named.conf.j2 b/bin/tests/system/randomizens/ns6/named.conf.j2 index 46eb3492e3f..e67202cb033 100644 --- a/bin/tests/system/randomizens/ns6/named.conf.j2 +++ b/bin/tests/system/randomizens/ns6/named.conf.j2 @@ -11,14 +11,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/reclimit/ns3/named.conf.j2 b/bin/tests/system/reclimit/ns3/named.conf.j2 index 4920c728e40..7f770556276 100644 --- a/bin/tests/system/reclimit/ns3/named.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named.conf.j2 @@ -16,13 +16,6 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/reclimit/ns3/named2.conf.j2 b/bin/tests/system/reclimit/ns3/named2.conf.j2 index 45d7a731975..4b92fd543bc 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named2.conf.j2 @@ -15,13 +15,6 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/reclimit/ns3/named3.conf.j2 b/bin/tests/system/reclimit/ns3/named3.conf.j2 index 5e316592331..ea6a1bbb3a5 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named3.conf.j2 @@ -16,13 +16,6 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/reclimit/ns3/named4.conf.j2 b/bin/tests/system/reclimit/ns3/named4.conf.j2 index fb187f3a2df..71d57fb4aa0 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named4.conf.j2 @@ -16,13 +16,6 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/reclimit/ns3/named5.conf.j2 b/bin/tests/system/reclimit/ns3/named5.conf.j2 index 0ad1120299a..f9a484a9d3c 100644 --- a/bin/tests/system/reclimit/ns3/named5.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named5.conf.j2 @@ -17,13 +17,6 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/reclimit/ns3/named6.conf.j2 b/bin/tests/system/reclimit/ns3/named6.conf.j2 index 4f9227d5a6b..6d153b3b506 100644 --- a/bin/tests/system/reclimit/ns3/named6.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named6.conf.j2 @@ -17,13 +17,6 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2 index 98fde4640a5..08e2fdc5d89 100644 --- a/bin/tests/system/redirect/ns2/named.conf.j2 +++ b/bin/tests/system/redirect/ns2/named.conf.j2 @@ -1,7 +1,5 @@ // NS2 -controls { /* empty */ }; - acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { @@ -19,14 +17,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/redirect/ns4/named.conf.j2 b/bin/tests/system/redirect/ns4/named.conf.j2 index 98d0ceab20c..b6c0b663f66 100644 --- a/bin/tests/system/redirect/ns4/named.conf.j2 +++ b/bin/tests/system/redirect/ns4/named.conf.j2 @@ -1,7 +1,5 @@ // NS2 -controls { /* empty */ }; - acl rfc1918 { 10/8; 192.168/16; 172.16/12; }; options { @@ -19,14 +17,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/resolver/ns1/named.conf.j2 b/bin/tests/system/resolver/ns1/named.conf.j2 index 4a4e50dc5ed..905e96b4cbe 100644 --- a/bin/tests/system/resolver/ns1/named.conf.j2 +++ b/bin/tests/system/resolver/ns1/named.conf.j2 @@ -53,11 +53,4 @@ view "alternative" { }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/resolver/ns1/named2.conf.j2 b/bin/tests/system/resolver/ns1/named2.conf.j2 index b8fa49c8e14..ee251467830 100644 --- a/bin/tests/system/resolver/ns1/named2.conf.j2 +++ b/bin/tests/system/resolver/ns1/named2.conf.j2 @@ -27,11 +27,4 @@ view "default" { {% endif %} }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/resolver/ns4/named.conf.j2 b/bin/tests/system/resolver/ns4/named.conf.j2 index 4fbd8f1d3a4..29933d7f694 100644 --- a/bin/tests/system/resolver/ns4/named.conf.j2 +++ b/bin/tests/system/resolver/ns4/named.conf.j2 @@ -48,11 +48,4 @@ zone "v4only.net" { file "v4only.net.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/resolver/ns5/named.conf.j2 b/bin/tests/system/resolver/ns5/named.conf.j2 index ad626612840..ac2b5934913 100644 --- a/bin/tests/system/resolver/ns5/named.conf.j2 +++ b/bin/tests/system/resolver/ns5/named.conf.j2 @@ -53,11 +53,4 @@ zone "child.server" { include "trusted.conf"; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/resolver/ns6/named.conf.j2 b/bin/tests/system/resolver/ns6/named.conf.j2 index 6293abe4568..19d6a853c8f 100644 --- a/bin/tests/system/resolver/ns6/named.conf.j2 +++ b/bin/tests/system/resolver/ns6/named.conf.j2 @@ -71,11 +71,4 @@ zone "targetns" { file "targetns.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/resolver/ns7/named.conf.j2 b/bin/tests/system/resolver/ns7/named.conf.j2 index 5c920f5a10b..cbf94cc3bb3 100644 --- a/bin/tests/system/resolver/ns7/named.conf.j2 +++ b/bin/tests/system/resolver/ns7/named.conf.j2 @@ -23,14 +23,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/resolver/ns7/named2.conf.j2 b/bin/tests/system/resolver/ns7/named2.conf.j2 index 9ea9873ed2b..c858207229d 100644 --- a/bin/tests/system/resolver/ns7/named2.conf.j2 +++ b/bin/tests/system/resolver/ns7/named2.conf.j2 @@ -22,14 +22,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/rfc5011/ns1/named.conf.j2 b/bin/tests/system/rfc5011/ns1/named.conf.j2 index dc1cb0a1713..e3c1a21bb62 100644 --- a/bin/tests/system/rfc5011/ns1/named.conf.j2 +++ b/bin/tests/system/rfc5011/ns1/named.conf.j2 @@ -8,12 +8,5 @@ options { recursion yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rndc/ns3/named.conf.j2 b/bin/tests/system/rndc/ns3/named.conf.j2 index 61afc765d04..470fe0e8758 100644 --- a/bin/tests/system/rndc/ns3/named.conf.j2 +++ b/bin/tests/system/rndc/ns3/named.conf.j2 @@ -6,19 +6,12 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - key secondkey { secret "abcd1234abcd8765"; algorithm @DEFAULT_HMAC@; }; -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view all { match-clients { any; }; diff --git a/bin/tests/system/rndc/ns6/named.conf.j2 b/bin/tests/system/rndc/ns6/named.conf.j2 index eb86bf83609..c046e789dcc 100644 --- a/bin/tests/system/rndc/ns6/named.conf.j2 +++ b/bin/tests/system/rndc/ns6/named.conf.j2 @@ -7,11 +7,4 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rndc/ns7/named.conf.j2 b/bin/tests/system/rndc/ns7/named.conf.j2 index 969296c4b79..2e320febc0d 100644 --- a/bin/tests/system/rndc/ns7/named.conf.j2 +++ b/bin/tests/system/rndc/ns7/named.conf.j2 @@ -6,11 +6,6 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - key int { algorithm @DEFAULT_HMAC@; secret "FrSt77yPTFx6hTs4i2tKLB9LmE0="; @@ -21,9 +16,7 @@ key ext { secret "FrSt77yPTFx6hTs4i2tKLB9LmE0="; }; -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view internal { match-clients { key "int"; }; diff --git a/bin/tests/system/rollover/ns2/named.conf.j2 b/bin/tests/system/rollover/ns2/named.conf.j2 index 7ac07dee5f4..009f1b9c487 100644 --- a/bin/tests/system/rollover/ns2/named.conf.j2 +++ b/bin/tests/system/rollover/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2 index ee6284621f7..b17d35b0ff9 100644 --- a/bin/tests/system/rollover/ns3/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns3/named.common.conf.j2 @@ -20,14 +20,7 @@ options { notify-cfg CDS { notify yes; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/rollover/ns4/named.common.conf.j2 b/bin/tests/system/rollover/ns4/named.common.conf.j2 index 9fd3520d37a..5fac1717c21 100644 --- a/bin/tests/system/rollover/ns4/named.common.conf.j2 +++ b/bin/tests/system/rollover/ns4/named.common.conf.j2 @@ -24,14 +24,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/rpz/ns1/named.conf.j2 b/bin/tests/system/rpz/ns1/named.conf.j2 index f4185b33934..332dfd5e87e 100644 --- a/bin/tests/system/rpz/ns1/named.conf.j2 +++ b/bin/tests/system/rpz/ns1/named.conf.j2 @@ -14,13 +14,6 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." {type primary; file "root.db";}; diff --git a/bin/tests/system/rpz/ns10/named.conf.j2 b/bin/tests/system/rpz/ns10/named.conf.j2 index 201f67d23b4..812252fb6c3 100644 --- a/bin/tests/system/rpz/ns10/named.conf.j2 +++ b/bin/tests/system/rpz/ns10/named.conf.j2 @@ -14,14 +14,7 @@ options { recursion yes; dnssec-validation yes; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.10 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "../trusted.conf"; zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/rpz/ns2/named.conf.j2 b/bin/tests/system/rpz/ns2/named.conf.j2 index 1b806df7f86..dfec3c3663e 100644 --- a/bin/tests/system/rpz/ns2/named.conf.j2 +++ b/bin/tests/system/rpz/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { recursion yes; dnssec-validation yes; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "../trusted.conf"; zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2 index 1e61c0b999d..69a383e679c 100644 --- a/bin/tests/system/rpz/ns3/named.conf.j2 +++ b/bin/tests/system/rpz/ns3/named.conf.j2 @@ -61,14 +61,7 @@ options { logging { category rpz { default_debug; }; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/rpz/ns4/named.conf.j2 b/bin/tests/system/rpz/ns4/named.conf.j2 index 98642248c49..c64ef18c0a8 100644 --- a/bin/tests/system/rpz/ns4/named.conf.j2 +++ b/bin/tests/system/rpz/ns4/named.conf.j2 @@ -15,14 +15,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "../trusted.conf"; zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/rpz/ns5/named.conf.j2 b/bin/tests/system/rpz/ns5/named.conf.j2 index a02e884d405..4fcde4b29c9 100644 --- a/bin/tests/system/rpz/ns5/named.conf.j2 +++ b/bin/tests/system/rpz/ns5/named.conf.j2 @@ -24,14 +24,7 @@ options { # turn rpz on or off include "rpz-switch"; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "../trusted.conf"; zone "." {type hint; file "hints"; }; diff --git a/bin/tests/system/rpz/ns6/named.conf.j2 b/bin/tests/system/rpz/ns6/named.conf.j2 index aa3b4cf371a..8686ce9e802 100644 --- a/bin/tests/system/rpz/ns6/named.conf.j2 +++ b/bin/tests/system/rpz/ns6/named.conf.j2 @@ -28,14 +28,7 @@ options { logging { category rpz { default_debug; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "../trusted.conf"; diff --git a/bin/tests/system/rpz/ns7/named.conf.j2 b/bin/tests/system/rpz/ns7/named.conf.j2 index ca8944f52fa..af971767d48 100644 --- a/bin/tests/system/rpz/ns7/named.conf.j2 +++ b/bin/tests/system/rpz/ns7/named.conf.j2 @@ -24,14 +24,7 @@ options { logging { category rpz { default_debug; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "../trusted.conf"; diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2 index 042e6949856..253b60885e0 100644 --- a/bin/tests/system/rpz/ns8/named.conf.j2 +++ b/bin/tests/system/rpz/ns8/named.conf.j2 @@ -36,14 +36,7 @@ options { logging { category rpz { default_debug; }; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/rpz/ns9/named.conf.j2 b/bin/tests/system/rpz/ns9/named.conf.j2 index e2c1f3d393e..3e871cea05c 100644 --- a/bin/tests/system/rpz/ns9/named.conf.j2 +++ b/bin/tests/system/rpz/ns9/named.conf.j2 @@ -30,14 +30,7 @@ options { logging { category rpz { default_debug; }; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.9 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints"; }; diff --git a/bin/tests/system/rpzextra/ns2/named.conf.j2 b/bin/tests/system/rpzextra/ns2/named.conf.j2 index 51e748c7dc0..2961b5185ed 100644 --- a/bin/tests/system/rpzextra/ns2/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/rpzextra/ns3/named.conf.j2 b/bin/tests/system/rpzextra/ns3/named.conf.j2 index c03ba63f996..8ba631b798a 100644 --- a/bin/tests/system/rpzextra/ns3/named.conf.j2 +++ b/bin/tests/system/rpzextra/ns3/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.j2 b/bin/tests/system/rpzrecurse/ns1/named.conf.j2 index f4171060dba..c839fe4f97e 100644 --- a/bin/tests/system/rpzrecurse/ns1/named.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns1/named.conf.j2 @@ -12,14 +12,7 @@ options { querylog yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 index 5b747c6da6e..429f764db56 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 +++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 @@ -1,5 +1,3 @@ -controls { /* empty */ }; - options { query-source address 10.53.0.2; notify-source 10.53.0.2; @@ -15,11 +13,4 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.j2 b/bin/tests/system/rpzrecurse/ns4/named.conf.j2 index efbeeec6f01..611e07d5407 100644 --- a/bin/tests/system/rpzrecurse/ns4/named.conf.j2 +++ b/bin/tests/system/rpzrecurse/ns4/named.conf.j2 @@ -1,5 +1,3 @@ -controls { /* empty */ }; - options { query-source address 10.53.0.4; notify-source 10.53.0.4; @@ -13,13 +11,6 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "child.example.tld" { type primary; file "child.example.db"; }; diff --git a/bin/tests/system/rrl/ns2/named.conf.j2 b/bin/tests/system/rrl/ns2/named.conf.j2 index 61b932049d3..a88e3d0d4cf 100644 --- a/bin/tests/system/rrl/ns2/named.conf.j2 +++ b/bin/tests/system/rrl/ns2/named.conf.j2 @@ -23,14 +23,7 @@ options { }; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} /* * These log settings have no effect unless "-g" is removed from ../../start.pl diff --git a/bin/tests/system/rrl/ns4/named.conf.j2 b/bin/tests/system/rrl/ns4/named.conf.j2 index 5e1315ae7fd..1f754efd792 100644 --- a/bin/tests/system/rrl/ns4/named.conf.j2 +++ b/bin/tests/system/rrl/ns4/named.conf.j2 @@ -25,14 +25,7 @@ options { }; }; - -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} /* * These log settings have no effect unless "-g" is removed from ../../start.pl diff --git a/bin/tests/system/rrsig/ns1/named.conf.j2 b/bin/tests/system/rrsig/ns1/named.conf.j2 index c287a2f8c6c..ba570d95e29 100644 --- a/bin/tests/system/rrsig/ns1/named.conf.j2 +++ b/bin/tests/system/rrsig/ns1/named.conf.j2 @@ -17,14 +17,7 @@ options { dnssec-policy none; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "test" { file "test.db"; diff --git a/bin/tests/system/runtime/ns2/named1.conf.j2 b/bin/tests/system/runtime/ns2/named1.conf.j2 index eae9122e57e..e4ecad2e045 100644 --- a/bin/tests/system/runtime/ns2/named1.conf.j2 +++ b/bin/tests/system/runtime/ns2/named1.conf.j2 @@ -11,11 +11,4 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 index 09fbdd4e702..543c5a08ef6 100644 --- a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 +++ b/bin/tests/system/selfpointedglue/ns4/named.conf.j2 @@ -49,11 +49,4 @@ zone "." { file "root.hint"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/serve_stale/ns1/named.conf.j2 b/bin/tests/system/serve_stale/ns1/named.conf.j2 index 17b09dd4000..37b439896f0 100644 --- a/bin/tests/system/serve_stale/ns1/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns1/named.conf.j2 @@ -3,14 +3,7 @@ {% set stale_refresh_time = stale_refresh_time | default(30) %} {% set stale_test_zone = stale_test_zone | default(False) %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/serve_stale/ns3/named.conf.j2 b/bin/tests/system/serve_stale/ns3/named.conf.j2 index 227daa0703f..cd6bdd85736 100644 --- a/bin/tests/system/serve_stale/ns3/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named1.conf.j2 b/bin/tests/system/serve_stale/ns3/named1.conf.j2 index c67313e0bf3..336d2dbf98b 100644 --- a/bin/tests/system/serve_stale/ns3/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named1.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named2.conf.j2 b/bin/tests/system/serve_stale/ns3/named2.conf.j2 index f6ad7954f35..dce1027cf92 100644 --- a/bin/tests/system/serve_stale/ns3/named2.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named2.conf.j2 @@ -2,14 +2,7 @@ * Test default stale-answer-client-timeout value */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named3.conf.j2 b/bin/tests/system/serve_stale/ns3/named3.conf.j2 index 0661a7cc5e1..3c0458d6c08 100644 --- a/bin/tests/system/serve_stale/ns3/named3.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named3.conf.j2 @@ -2,14 +2,7 @@ * Test disable of stale-answer-client-timeout. */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named4.conf.j2 b/bin/tests/system/serve_stale/ns3/named4.conf.j2 index 85da1d1bf9e..34fa3489e5f 100644 --- a/bin/tests/system/serve_stale/ns3/named4.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named4.conf.j2 @@ -2,14 +2,7 @@ * Test stale-answer-client-timeout 0. */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named5.conf.j2 b/bin/tests/system/serve_stale/ns3/named5.conf.j2 index 845ee820b61..105b58db988 100644 --- a/bin/tests/system/serve_stale/ns3/named5.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named5.conf.j2 @@ -2,14 +2,7 @@ * Test stale-answer-client-timeout 0. */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named6.conf.j2 b/bin/tests/system/serve_stale/ns3/named6.conf.j2 index 59a3266af38..cf451999520 100644 --- a/bin/tests/system/serve_stale/ns3/named6.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named6.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named7.conf.j2 b/bin/tests/system/serve_stale/ns3/named7.conf.j2 index 79b197bbd14..0e8317750ec 100644 --- a/bin/tests/system/serve_stale/ns3/named7.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named7.conf.j2 @@ -2,14 +2,7 @@ * Test serve-stale interaction with fetch-limits (dual-mode). */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named8.conf.j2 b/bin/tests/system/serve_stale/ns3/named8.conf.j2 index c9a495313de..3dbf03b7628 100644 --- a/bin/tests/system/serve_stale/ns3/named8.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named8.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns3/named9.conf.j2 b/bin/tests/system/serve_stale/ns3/named9.conf.j2 index dd46102be76..49d25134759 100644 --- a/bin/tests/system/serve_stale/ns3/named9.conf.j2 +++ b/bin/tests/system/serve_stale/ns3/named9.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/serve_stale/ns4/named.conf.j2 b/bin/tests/system/serve_stale/ns4/named.conf.j2 index 2e1fab5b06e..33720fdfb58 100644 --- a/bin/tests/system/serve_stale/ns4/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns4/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.4; diff --git a/bin/tests/system/serve_stale/ns5/named.conf.j2 b/bin/tests/system/serve_stale/ns5/named.conf.j2 index cb8d4acd288..65ae9889fab 100644 --- a/bin/tests/system/serve_stale/ns5/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns5/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.5; diff --git a/bin/tests/system/serve_stale/ns6/named.conf.j2 b/bin/tests/system/serve_stale/ns6/named.conf.j2 index 883e9ba4ca2..dd38d18d14f 100644 --- a/bin/tests/system/serve_stale/ns6/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns6/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.6; diff --git a/bin/tests/system/serve_stale/ns7/named.conf.j2 b/bin/tests/system/serve_stale/ns7/named.conf.j2 index 5782814ae40..fb88088d612 100644 --- a/bin/tests/system/serve_stale/ns7/named.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.7; diff --git a/bin/tests/system/serve_stale/ns7/named1.conf.j2 b/bin/tests/system/serve_stale/ns7/named1.conf.j2 index ba05bdf17a4..daf6481e127 100644 --- a/bin/tests/system/serve_stale/ns7/named1.conf.j2 +++ b/bin/tests/system/serve_stale/ns7/named1.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.7; diff --git a/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 index de5a836e486..d3ad87ac46e 100644 --- a/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 +++ b/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2 @@ -11,14 +11,7 @@ * information regarding copyright ownership. */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 index 32ed90cf4c4..ca238009140 100644 --- a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 +++ b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 @@ -11,14 +11,7 @@ * information regarding copyright ownership. */ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { port @PORT@; diff --git a/bin/tests/system/sfcache/ns2/named.conf.j2 b/bin/tests/system/sfcache/ns2/named.conf.j2 index 465bb522e39..c1a19196ca6 100644 --- a/bin/tests/system/sfcache/ns2/named.conf.j2 +++ b/bin/tests/system/sfcache/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/sfcache/ns5/named.conf.j2 b/bin/tests/system/sfcache/ns5/named.conf.j2 index 02f50fbb9a4..c13e8be4a72 100644 --- a/bin/tests/system/sfcache/ns5/named.conf.j2 +++ b/bin/tests/system/sfcache/ns5/named.conf.j2 @@ -15,14 +15,7 @@ options { servfail-ttl @servfail_ttl@; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/showconf/ns1/named.conf.j2 b/bin/tests/system/showconf/ns1/named.conf.j2 index 997d5834e8f..0b437d0eaeb 100644 --- a/bin/tests/system/showconf/ns1/named.conf.j2 +++ b/bin/tests/system/showconf/ns1/named.conf.j2 @@ -12,14 +12,7 @@ options { allow-new-zones yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example.com" { type primary; diff --git a/bin/tests/system/shutdown/ns1/named.conf.j2 b/bin/tests/system/shutdown/ns1/named.conf.j2 index 073049e3aa0..59639068183 100644 --- a/bin/tests/system/shutdown/ns1/named.conf.j2 +++ b/bin/tests/system/shutdown/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/shutdown/ns2/named.conf.j2 b/bin/tests/system/shutdown/ns2/named.conf.j2 index fbe71161fff..7d4df6b77e0 100644 --- a/bin/tests/system/shutdown/ns2/named.conf.j2 +++ b/bin/tests/system/shutdown/ns2/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/sig0/ns1/named.conf.j2 b/bin/tests/system/sig0/ns1/named.conf.j2 index 3196e19536e..5a140786972 100644 --- a/bin/tests/system/sig0/ns1/named.conf.j2 +++ b/bin/tests/system/sig0/ns1/named.conf.j2 @@ -10,14 +10,7 @@ options { notify no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} view "v1" { match-clients { any; }; diff --git a/bin/tests/system/srtt/ns6/named.conf.j2 b/bin/tests/system/srtt/ns6/named.conf.j2 index 1d27505a8e4..fe402430cb6 100644 --- a/bin/tests/system/srtt/ns6/named.conf.j2 +++ b/bin/tests/system/srtt/ns6/named.conf.j2 @@ -26,14 +26,7 @@ options { dnstap-output file "dnstap.out"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/ssumaxtype/ns1/named.conf.j2 b/bin/tests/system/ssumaxtype/ns1/named.conf.j2 index 21333a5e7d7..dc3e5351fb0 100644 --- a/bin/tests/system/ssumaxtype/ns1/named.conf.j2 +++ b/bin/tests/system/ssumaxtype/ns1/named.conf.j2 @@ -10,14 +10,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key "ddns-key" { algorithm @DEFAULT_HMAC@; diff --git a/bin/tests/system/ssutoctou/ns1/named.conf.j2 b/bin/tests/system/ssutoctou/ns1/named.conf.j2 index 9ae94b3cbc3..5a517773934 100644 --- a/bin/tests/system/ssutoctou/ns1/named.conf.j2 +++ b/bin/tests/system/ssutoctou/ns1/named.conf.j2 @@ -12,14 +12,7 @@ options { dnssec-validation no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type primary; diff --git a/bin/tests/system/staticstub/ns2/named.conf.j2 b/bin/tests/system/staticstub/ns2/named.conf.j2 index d1ef0f7a686..01e537ba53f 100644 --- a/bin/tests/system/staticstub/ns2/named.conf.j2 +++ b/bin/tests/system/staticstub/ns2/named.conf.j2 @@ -1,13 +1,6 @@ {% set server_config_use_addr = server_config_use_addr | default(False) %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} include "trusted.conf"; diff --git a/bin/tests/system/staticstub/ns3/named.conf.j2 b/bin/tests/system/staticstub/ns3/named.conf.j2 index 585f77053af..4c29d128329 100644 --- a/bin/tests/system/staticstub/ns3/named.conf.j2 +++ b/bin/tests/system/staticstub/ns3/named.conf.j2 @@ -1,13 +1,6 @@ {% set example_zone = example_zone | default(True) %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2 index 89aa8cf830f..dff7ed6f963 100644 --- a/bin/tests/system/statistics/ns2/named1.conf.j2 +++ b/bin/tests/system/statistics/ns2/named1.conf.j2 @@ -17,14 +17,7 @@ statistics-channels { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2 index 0628ea956b1..fd29305b1d4 100644 --- a/bin/tests/system/statistics/ns2/named2.conf.j2 +++ b/bin/tests/system/statistics/ns2/named2.conf.j2 @@ -17,14 +17,7 @@ statistics-channels { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2 index d6df4efcc65..6de8fa3526d 100644 --- a/bin/tests/system/statistics/ns3/named.conf.j2 +++ b/bin/tests/system/statistics/ns3/named.conf.j2 @@ -20,14 +20,7 @@ statistics-channels { }; {% endif %} -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/statschannel/ns1/named.conf.j2 b/bin/tests/system/statschannel/ns1/named.conf.j2 index 9d22ff3ca8e..38f88ed6782 100644 --- a/bin/tests/system/statschannel/ns1/named.conf.j2 +++ b/bin/tests/system/statschannel/ns1/named.conf.j2 @@ -20,14 +20,7 @@ options { statistics-channels { inet 10.53.0.1 port @EXTRAPORT1@ allow { localhost; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server 10.53.0.3 { transfer-format one-answer; diff --git a/bin/tests/system/statschannel/ns2/named.conf.j2 b/bin/tests/system/statschannel/ns2/named.conf.j2 index 0734cc5ed17..6bc3bd60c16 100644 --- a/bin/tests/system/statschannel/ns2/named.conf.j2 +++ b/bin/tests/system/statschannel/ns2/named.conf.j2 @@ -16,14 +16,7 @@ options { statistics-channels { inet 10.53.0.2 port @EXTRAPORT1@ allow { localhost; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "dnssec" { inline-signing no; diff --git a/bin/tests/system/statschannel/ns2/named2.conf.j2 b/bin/tests/system/statschannel/ns2/named2.conf.j2 index 1882e783d41..33265ea77fa 100644 --- a/bin/tests/system/statschannel/ns2/named2.conf.j2 +++ b/bin/tests/system/statschannel/ns2/named2.conf.j2 @@ -16,14 +16,7 @@ options { statistics-channels { inet 10.53.0.2 port @EXTRAPORT1@ allow { localhost; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "dnssec" { keys { diff --git a/bin/tests/system/statschannel/ns3/named.conf.j2 b/bin/tests/system/statschannel/ns3/named.conf.j2 index 3a096307595..d6a671b5874 100644 --- a/bin/tests/system/statschannel/ns3/named.conf.j2 +++ b/bin/tests/system/statschannel/ns3/named.conf.j2 @@ -20,14 +20,7 @@ options { statistics-channels { inet 10.53.0.3 port @EXTRAPORT1@ allow { localhost; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server fd92:7065:b8e:ffff::1 { tcp-only yes; diff --git a/bin/tests/system/statschannel/ns4/named.conf.j2 b/bin/tests/system/statschannel/ns4/named.conf.j2 index ccebc037885..be66fdd0262 100644 --- a/bin/tests/system/statschannel/ns4/named.conf.j2 +++ b/bin/tests/system/statschannel/ns4/named.conf.j2 @@ -15,14 +15,7 @@ options { statistics-channels { inet 10.53.0.4 port @EXTRAPORT1@ allow { localhost; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example2" { type primary; diff --git a/bin/tests/system/stress/ns3/named.conf.j2 b/bin/tests/system/stress/ns3/named.conf.j2 index 7ffbdfeccd6..e9591d3c086 100644 --- a/bin/tests/system/stress/ns3/named.conf.j2 +++ b/bin/tests/system/stress/ns3/named.conf.j2 @@ -1,5 +1,3 @@ -controls { /* empty */ }; - options { query-source address 10.53.0.3; notify-source 10.53.0.3; @@ -14,14 +12,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} server 10.53.0.4 { provide-ixfr no; diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2 index b307b3b64b5..8812ebd602d 100644 --- a/bin/tests/system/stub/ns3/named.conf.j2 +++ b/bin/tests/system/stub/ns3/named.conf.j2 @@ -12,14 +12,7 @@ options { minimal-responses no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 index d5d284c5f5c..91e20e857f7 100644 --- a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 index b70fa285438..24ba0a8cb74 100644 --- a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 index 324261aab38..181a964b7ef 100644 --- a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 @@ -13,14 +13,7 @@ options { dnssec-validation yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 index 0430aaeda7e..0a751253075 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 @@ -14,14 +14,7 @@ options { synth-from-dnssec no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 index 4b1b4f54314..264ad0aa89d 100644 --- a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 @@ -15,14 +15,7 @@ options { validate-except { example.internal; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 index c920768b121..39ac70456be 100644 --- a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 +++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 @@ -14,14 +14,7 @@ options { synth-from-dnssec yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} statistics-channels { diff --git a/bin/tests/system/synthrecord/ns1/named.conf.j2 b/bin/tests/system/synthrecord/ns1/named.conf.j2 index 0193196b1fa..9a92c391b87 100644 --- a/bin/tests/system/synthrecord/ns1/named.conf.j2 +++ b/bin/tests/system/synthrecord/ns1/named.conf.j2 @@ -10,14 +10,7 @@ options { recursion no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% if inview %} plugin query "@TOP_BUILDDIR@/synthrecord" { diff --git a/bin/tests/system/tcp/ns1/named.conf.j2 b/bin/tests/system/tcp/ns1/named.conf.j2 index 934b6196d34..d32286482e3 100644 --- a/bin/tests/system/tcp/ns1/named.conf.j2 +++ b/bin/tests/system/tcp/ns1/named.conf.j2 @@ -12,14 +12,7 @@ options { statistics-file "named.stats"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2 index 0e05729c405..1c59af9b72f 100644 --- a/bin/tests/system/tcp/ns2/named.conf.j2 +++ b/bin/tests/system/tcp/ns2/named.conf.j2 @@ -12,14 +12,7 @@ options { statistics-file "named.stats"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2 index 2c46d128dd4..5f0c9697593 100644 --- a/bin/tests/system/tcp/ns3/named.conf.j2 +++ b/bin/tests/system/tcp/ns3/named.conf.j2 @@ -14,14 +14,7 @@ options { server 10.53.0.1 { tcp-only yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2 index 9b6d365b7b7..ec170e2788c 100644 --- a/bin/tests/system/tcp/ns4/named.conf.j2 +++ b/bin/tests/system/tcp/ns4/named.conf.j2 @@ -16,14 +16,7 @@ options { server 10.53.0.2 { tcp-only yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2 index 160d0535003..84cce7f44ae 100644 --- a/bin/tests/system/tcp/ns5/named.conf.j2 +++ b/bin/tests/system/tcp/ns5/named.conf.j2 @@ -1,13 +1,6 @@ // NS5 -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { diff --git a/bin/tests/system/tcp/ns7/named.conf.j2 b/bin/tests/system/tcp/ns7/named.conf.j2 index 8008f22dd9b..d942dcc16f7 100644 --- a/bin/tests/system/tcp/ns7/named.conf.j2 +++ b/bin/tests/system/tcp/ns7/named.conf.j2 @@ -13,14 +13,7 @@ options { tcp-clients 1; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/tkeyleak/ns1/named.conf.j2 b/bin/tests/system/tkeyleak/ns1/named.conf.j2 index f16b53414cc..b7bb534f59a 100644 --- a/bin/tests/system/tkeyleak/ns1/named.conf.j2 +++ b/bin/tests/system/tkeyleak/ns1/named.conf.j2 @@ -24,14 +24,7 @@ options { tkey-gssapi-keytab "dns.keytab"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type primary; diff --git a/bin/tests/system/tsiggss/ns1/named.conf.j2 b/bin/tests/system/tsiggss/ns1/named.conf.j2 index 10f6543b385..d9c434b2064 100644 --- a/bin/tests/system/tsiggss/ns1/named.conf.j2 +++ b/bin/tests/system/tsiggss/ns1/named.conf.j2 @@ -13,14 +13,7 @@ options { tkey-gssapi-keytab "dns.keytab"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example.nil." IN { type primary; diff --git a/bin/tests/system/ttl/ns1/named.conf.j2 b/bin/tests/system/ttl/ns1/named.conf.j2 index 7ba8e8f25a3..597e99ce376 100644 --- a/bin/tests/system/ttl/ns1/named.conf.j2 +++ b/bin/tests/system/ttl/ns1/named.conf.j2 @@ -1,11 +1,4 @@ -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/ttl/ns2/named.conf.j2 b/bin/tests/system/ttl/ns2/named.conf.j2 index 4b17e1b2cd4..00adee32f1b 100644 --- a/bin/tests/system/ttl/ns2/named.conf.j2 +++ b/bin/tests/system/ttl/ns2/named.conf.j2 @@ -17,13 +17,6 @@ options { max-ncache-ttl 60; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; file "hints.db"; }; diff --git a/bin/tests/system/upforwd/ns3/named.conf.j2 b/bin/tests/system/upforwd/ns3/named.conf.j2 index c803d7fd088..98cad6f8e06 100644 --- a/bin/tests/system/upforwd/ns3/named.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named.conf.j2 @@ -15,14 +15,7 @@ options { include "dnstap.conf"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} tls tls-example-primary { remote-hostname "srv01.crt01.example.com"; // enable Strict TLS diff --git a/bin/tests/system/upforwd/ns3/named2.conf.j2 b/bin/tests/system/upforwd/ns3/named2.conf.j2 index fe2b5857672..8b5f6d522a3 100644 --- a/bin/tests/system/upforwd/ns3/named2.conf.j2 +++ b/bin/tests/system/upforwd/ns3/named2.conf.j2 @@ -15,14 +15,7 @@ options { update-quota 1; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "example" { type secondary; diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2 index 631bad54c28..ab1e358636b 100644 --- a/bin/tests/system/views/ns2/named.conf.j2 +++ b/bin/tests/system/views/ns2/named.conf.j2 @@ -12,14 +12,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "views" { keys { diff --git a/bin/tests/system/views/ns2/named2.conf.j2 b/bin/tests/system/views/ns2/named2.conf.j2 index 266b95c4134..7ccf8b3f5d6 100644 --- a/bin/tests/system/views/ns2/named2.conf.j2 +++ b/bin/tests/system/views/ns2/named2.conf.j2 @@ -12,14 +12,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "views" { keys { diff --git a/bin/tests/system/views/ns2/named3.conf.j2 b/bin/tests/system/views/ns2/named3.conf.j2 index 4bdac8259c8..ae11b67c4a2 100644 --- a/bin/tests/system/views/ns2/named3.conf.j2 +++ b/bin/tests/system/views/ns2/named3.conf.j2 @@ -14,14 +14,7 @@ options { notify no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} {% for name in zone_names %} zone "@name@" { diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2 index 46fd6173662..0b663b64ae7 100644 --- a/bin/tests/system/views/ns3/named.conf.j2 +++ b/bin/tests/system/views/ns3/named.conf.j2 @@ -12,14 +12,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2 index 780d8fb864d..9dd96058880 100644 --- a/bin/tests/system/views/ns3/named2.conf.j2 +++ b/bin/tests/system/views/ns3/named2.conf.j2 @@ -12,14 +12,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2 index 1c635d3b4a9..833619312dc 100644 --- a/bin/tests/system/views/ns5/named.conf.j2 +++ b/bin/tests/system/views/ns5/named.conf.j2 @@ -12,14 +12,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type hint; diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2 index 736c93db271..9765821d72a 100644 --- a/bin/tests/system/xfer/ns2/named.conf.j2 +++ b/bin/tests/system/xfer/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { check-integrity no; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key tsigzone. { algorithm @DEFAULT_HMAC@; diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2 index 64a8d0dfde6..ac11f0667bb 100644 --- a/bin/tests/system/xfer/ns3/named.conf.j2 +++ b/bin/tests/system/xfer/ns3/named.conf.j2 @@ -12,14 +12,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} key tsigzone. { algorithm @DEFAULT_HMAC@; diff --git a/bin/tests/system/xfer/ns4/named.conf.j2 b/bin/tests/system/xfer/ns4/named.conf.j2 index cd070e88b4b..9e4ecf3828a 100644 --- a/bin/tests/system/xfer/ns4/named.conf.j2 +++ b/bin/tests/system/xfer/ns4/named.conf.j2 @@ -14,11 +14,6 @@ options { blackhole { none; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - key unused_key. { secret "1234abcd8765"; algorithm @DEFAULT_HMAC@; @@ -29,9 +24,7 @@ key tsig_key. { algorithm @DEFAULT_HMAC@; }; -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; 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 44b35d6884a..b03095e831e 100644 --- a/bin/tests/system/xfer_servers_list/ns1/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns1/named.conf.j2 @@ -54,11 +54,4 @@ zone "test" { file "test.db"; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 index 7f72556b8cf..76e0c486886 100644 --- a/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns2/named.conf.j2 @@ -25,11 +25,4 @@ zone "test" { primaries { 10.53.0.1 port @PORT@ key xfrkey; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 index b51a28f4125..a012d7b6cac 100644 --- a/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns3/named.conf.j2 @@ -25,11 +25,4 @@ zone "test" { primaries { 10.53.0.1 port @PORT@ key xfrkey; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 b/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 index a30ab4adba2..89ce6bef5f4 100644 --- a/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 +++ b/bin/tests/system/xfer_servers_list/ns4/named.conf.j2 @@ -25,11 +25,4 @@ zone "test" { primaries { 10.53.0.1 port @PORT@ key xfrkey; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} diff --git a/bin/tests/system/xferquota/ns1/named.conf.j2 b/bin/tests/system/xferquota/ns1/named.conf.j2 index 90e9417c42c..98a473eceea 100644 --- a/bin/tests/system/xferquota/ns1/named.conf.j2 +++ b/bin/tests/system/xferquota/ns1/named.conf.j2 @@ -14,14 +14,7 @@ options { transfers-out 3; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/xferquota/ns3/named.conf.j2 b/bin/tests/system/xferquota/ns3/named.conf.j2 index 4a0d70ca556..c882985899a 100644 --- a/bin/tests/system/xferquota/ns3/named.conf.j2 +++ b/bin/tests/system/xferquota/ns3/named.conf.j2 @@ -26,14 +26,7 @@ options { allow-transfer { 10.53.0.2; }; }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "." { type primary; diff --git a/bin/tests/system/zonechecks/ns1/named.conf.j2 b/bin/tests/system/zonechecks/ns1/named.conf.j2 index d840b170ce2..83b04dec1b8 100644 --- a/bin/tests/system/zonechecks/ns1/named.conf.j2 +++ b/bin/tests/system/zonechecks/ns1/named.conf.j2 @@ -14,14 +14,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} dnssec-policy "zonechecks" { inline-signing no; diff --git a/bin/tests/system/zonechecks/ns2/named.conf.j2 b/bin/tests/system/zonechecks/ns2/named.conf.j2 index 46968b71e2a..46c14718e00 100644 --- a/bin/tests/system/zonechecks/ns2/named.conf.j2 +++ b/bin/tests/system/zonechecks/ns2/named.conf.j2 @@ -14,14 +14,7 @@ options { }; -key rndc_key { - secret "1234abcd8765"; - algorithm @DEFAULT_HMAC@; -}; - -controls { - inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; -}; +{% include "_common/controls.conf.j2" %} zone "primary.example" { type secondary;