Use controls template in named configs where rndc.key was included

Same sweep as the previous commit, for the configs that obtained the
key via a native `include ".../_common/rndc.key";`.

Commit was split up for easier review-ability.

Assisted-by: Claude:claude-fable-5

diff --git a/bin/tests/system/additional/ns1/named.conf.j2 b/bin/tests/system/additional/ns1/named.conf.j2
index c2f44488009a01fa71ee6207d0b3cb413c7df123..54ecef1c393fdfbc68862a8d448334d19132f078 100644 (file)
--- a/bin/tests/system/additional/ns1/named.conf.j2
+++ b/bin/tests/system/additional/ns1/named.conf.j2
@@ -12,11 +12,7 @@ options {
        minimal-responses yes;
 };
 
-include "../../_common/rndc.key";
-
-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/additional/ns1/named2.conf.j2 b/bin/tests/system/additional/ns1/named2.conf.j2
index 742bf7fc77f64115d253d350f041c04d12b4d554..aea12f5f5b6265928edf0996bf2cf59ca997b813 100644 (file)
--- a/bin/tests/system/additional/ns1/named2.conf.j2
+++ b/bin/tests/system/additional/ns1/named2.conf.j2
@@ -12,11 +12,7 @@ options {
        minimal-responses no;
 };
 
-include "../../_common/rndc.key";
-
-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/additional/ns1/named3.conf.j2 b/bin/tests/system/additional/ns1/named3.conf.j2
index c34ccc1a08f57cf249c928f894812657ac6425d8..5635854b419fd9338df16397d45ba67b60dc118b 100644 (file)
--- a/bin/tests/system/additional/ns1/named3.conf.j2
+++ b/bin/tests/system/additional/ns1/named3.conf.j2
@@ -13,11 +13,7 @@ options {
        minimal-responses no-auth;
 };
 
-include "../../_common/rndc.key";
-
-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/additional/ns1/named4.conf.j2 b/bin/tests/system/additional/ns1/named4.conf.j2
index 3194e8a9f128c0710f8dcc43e6bf91a1392429f0..04819375469abd2fbce13e20bc8f63616b8f49ee 100644 (file)
--- a/bin/tests/system/additional/ns1/named4.conf.j2
+++ b/bin/tests/system/additional/ns1/named4.conf.j2
@@ -12,11 +12,7 @@ options {
        minimal-responses no-auth-recursive;
 };
 
-include "../../_common/rndc.key";
-
-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/addzone/ns2/named.conf.j2 b/bin/tests/system/addzone/ns2/named.conf.j2
index 0b39c98dd58e18a218ec0d157c87817d4e9f6e81..4bca9c7aa0cc9a793ac9a3042d838668f92ef109 100644 (file)
--- a/bin/tests/system/addzone/ns2/named.conf.j2
+++ b/bin/tests/system/addzone/ns2/named.conf.j2
@@ -9,11 +9,7 @@ options {
        dnssec-validation no;
 };
 
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 template primary {
        type primary;

diff --git a/bin/tests/system/addzone/ns2/named2.conf.j2 b/bin/tests/system/addzone/ns2/named2.conf.j2
index e077e8fb2b67eff18369d53b58070244a2d3394f..89417a116f31c181e69caa92f0be84062b583d10 100644 (file)
--- a/bin/tests/system/addzone/ns2/named2.conf.j2
+++ b/bin/tests/system/addzone/ns2/named2.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 
 options {

diff --git a/bin/tests/system/addzone/ns2/named3.conf.j2 b/bin/tests/system/addzone/ns2/named3.conf.j2
index 84382576d83806b087b47ea4f51bfe0a8a7f0240..0924d41bfab0be733efb4bf197a55dee73d2560d 100644 (file)
--- a/bin/tests/system/addzone/ns2/named3.conf.j2
+++ b/bin/tests/system/addzone/ns2/named3.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/addzone/ns3/named.conf.j2 b/bin/tests/system/addzone/ns3/named.conf.j2
index 8db614836c0ff3b1a4b4610f083727b277655203..9a0c32161da6178931aa0bc937a70f9d7874b28d 100644 (file)
--- a/bin/tests/system/addzone/ns3/named.conf.j2
+++ b/bin/tests/system/addzone/ns3/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/addzone/ns3/named2.conf.j2 b/bin/tests/system/addzone/ns3/named2.conf.j2
index dcb427230039ea1fe639a4fcf8f550884c25d928..1821fd46eaf35cefedbfa1a1992ccfab0e49ac8b 100644 (file)
--- a/bin/tests/system/addzone/ns3/named2.conf.j2
+++ b/bin/tests/system/addzone/ns3/named2.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/bailiwick/ns4/named.conf.j2 b/bin/tests/system/bailiwick/ns4/named.conf.j2
index 3b9b52207ccb92f8393bcd1a09e6c14aaa47d5d5..4f4d200d9680ac42df5bd17cfb600fd58cc32ad2 100644 (file)
--- a/bin/tests/system/bailiwick/ns4/named.conf.j2
+++ b/bin/tests/system/bailiwick/ns4/named.conf.j2
@@ -11,11 +11,7 @@ options {
        qname-minimization off;
 };
 
-controls {
-       inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/builtin/ns1/named.conf.j2 b/bin/tests/system/builtin/ns1/named.conf.j2
index 4f8a1c0fba042abf0129bdda23c88657e8f4e6fe..1e8c4c85bf9be7addddcf39975a316e52dfa019f 100644 (file)
--- a/bin/tests/system/builtin/ns1/named.conf.j2
+++ b/bin/tests/system/builtin/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/builtin/ns2/named.conf.j2 b/bin/tests/system/builtin/ns2/named.conf.j2
index 7b8a6d6fd4bd60dcb61ec177e59f7dd364876e7a..249358784ecd3f2419d72ef67fb6eee67a2ba10d 100644 (file)
--- a/bin/tests/system/builtin/ns2/named.conf.j2
+++ b/bin/tests/system/builtin/ns2/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/builtin/ns3/named.conf.j2 b/bin/tests/system/builtin/ns3/named.conf.j2
index ae8982d85478114c091f9318136e03fb7a6448e1..04bdae9c47f6dae77107df0964997c13720fc126 100644 (file)
--- a/bin/tests/system/builtin/ns3/named.conf.j2
+++ b/bin/tests/system/builtin/ns3/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/catz/ns1/named.conf.j2 b/bin/tests/system/catz/ns1/named.conf.j2
index b702e09f4ad76dddcd65b53e1ba0249b32111aa1..77d1441591504228d40e846a725b94f33e40e6b3 100644 (file)
--- a/bin/tests/system/catz/ns1/named.conf.j2
+++ b/bin/tests/system/catz/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/catz/ns2/named.conf.j2 b/bin/tests/system/catz/ns2/named.conf.j2
index 4f354d2bb93322d11f593460d46cc8aaa28c132e..620bfd6e3b5ebe43fd4e95ded0c8de922964681e 100644 (file)
--- a/bin/tests/system/catz/ns2/named.conf.j2
+++ b/bin/tests/system/catz/ns2/named.conf.j2
@@ -4,11 +4,7 @@
 {% set catalog5 = catalog5 | default(False) %}
 {% set duplicate_zone = duplicate_zone | default(False) %}
 
-include "../../_common/rndc.key";
-
-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/catz/ns2/named7.conf.j2 b/bin/tests/system/catz/ns2/named7.conf.j2
index c70e5ee6e0148278a52a986c0c5f8125a2eaf09a..1076e8c8de73356d815f8a8053748b426b1d55b4 100644 (file)
--- a/bin/tests/system/catz/ns2/named7.conf.j2
+++ b/bin/tests/system/catz/ns2/named7.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/catz/ns3/named.conf.j2 b/bin/tests/system/catz/ns3/named.conf.j2
index 1beb0aff9af9f0d1f55a5f2b891564889459c666..3b491aed939e11e6ecee53cbcf4d11ff8fa1639d 100644 (file)
--- a/bin/tests/system/catz/ns3/named.conf.j2
+++ b/bin/tests/system/catz/ns3/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/catz/ns4/named.conf.j2 b/bin/tests/system/catz/ns4/named.conf.j2
index 366fda676575c7217883feecc350e8a84b0c2c03..6525482b3243bcd36ecbacac278cef02de4a547d 100644 (file)
--- a/bin/tests/system/catz/ns4/named.conf.j2
+++ b/bin/tests/system/catz/ns4/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/cipher_suites/ns1/named.conf.j2 b/bin/tests/system/cipher_suites/ns1/named.conf.j2
index 75a635354b165ed573df4af4cbeafcd97f565a48..791ac23430cb33912551df6c3f0050f9eda05b4a 100644 (file)
--- a/bin/tests/system/cipher_suites/ns1/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls tls-perfect-forward-secrecy {
        protocols { TLSv1.3; };

diff --git a/bin/tests/system/cipher_suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2
index 38d66e0e8dd5f6b6f57379e396e7a704b6e69305..b41f5d14261019ac4b7f1dff65924c7994d00b14 100644 (file)
--- a/bin/tests/system/cipher_suites/ns2/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns2/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../self-signed-key.pem";

diff --git a/bin/tests/system/cipher_suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2
index 68e00f44193e28007ac1014368b8a8bf031e18c6..5b92a91369f356c9c03c6f789b1c9dd8de9e9c7c 100644 (file)
--- a/bin/tests/system/cipher_suites/ns3/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns3/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../self-signed-key.pem";

diff --git a/bin/tests/system/cipher_suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2
index 1d3bed6fb63519af41c1dfd127bb0ee7b9e4bb8f..a2a4c5deb90851da82c23492544423eafecdabf7 100644 (file)
--- a/bin/tests/system/cipher_suites/ns4/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns4/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../self-signed-key.pem";

diff --git a/bin/tests/system/cipher_suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2
index c2b85fa05e8f6315761c2aa504bf7f324e681039..5c48278e7d2104c669908e6781ea3c66a66dd1b9 100644 (file)
--- a/bin/tests/system/cipher_suites/ns5/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns5/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../self-signed-key.pem";

diff --git a/bin/tests/system/dns64/ns1/named.conf.j2 b/bin/tests/system/dns64/ns1/named.conf.j2
index 6302d774af050b393249350fdbe0472808318960..2467b3f686c3f76538ce42104bc023a15bc02cc7 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf.j2
+++ b/bin/tests/system/dns64/ns1/named.conf.j2
@@ -1,10 +1,6 @@
 // NS1
 
-include "../../_common/rndc.key";
-
-controls {
-        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 

diff --git a/bin/tests/system/dns64/ns1/named2.conf.j2 b/bin/tests/system/dns64/ns1/named2.conf.j2
index 432a717640e66f90b1c54988d034f572cfd09399..cccfe349bdae8d4db953a07fdf86a36c8c68a8ed 100644 (file)
--- a/bin/tests/system/dns64/ns1/named2.conf.j2
+++ b/bin/tests/system/dns64/ns1/named2.conf.j2
@@ -1,10 +1,6 @@
 // NS1
 
-include "../../_common/rndc.key";
-
-controls {
-        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 

diff --git a/bin/tests/system/dns64/ns1/named3.conf.j2 b/bin/tests/system/dns64/ns1/named3.conf.j2
index c82b7afee5e30296b25e527e6ec8db18f8b29fb3..237ff6a71222d21a4bfa5d2aacf61f4eeb96b935 100644 (file)
--- a/bin/tests/system/dns64/ns1/named3.conf.j2
+++ b/bin/tests/system/dns64/ns1/named3.conf.j2
@@ -1,10 +1,6 @@
 // NS1
 
-include "../../_common/rndc.key";
-
-controls {
-        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 

diff --git a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
index abece97eb2a349417ef7a3b8fab92a3ed98bffd4..91c475783a964e3b01f0b20205d30c0cbf284835 100644 (file)
--- a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
@@ -14,11 +14,7 @@ options {
        qname-minimization off;
 };
 
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
index ce5b22c3227cf11e5d9fe0581279fd2d6981dd50..69a1864b5e35ee799e8b1b90d422b8b39dd819d9 100644 (file)
--- a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
@@ -16,11 +16,7 @@ options {
        minimal-responses no;
 };
 
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
index 890d1529835de933b7db6aca12b2c362f4a06b86..f7985c92dca6966d8534f8eb0d792707ea3f4ff0 100644 (file)
--- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
@@ -13,11 +13,7 @@ options {
        minimal-responses no;
 };
 
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/doth/ns1/named.conf.j2 b/bin/tests/system/doth/ns1/named.conf.j2
index 22d025049cc397a797bab37fe6caf390e78ff08e..116b075e68ef5af3de96fdc4de0e1b79f33de02b 100644 (file)
--- a/bin/tests/system/doth/ns1/named.conf.j2
+++ b/bin/tests/system/doth/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 http local {
        endpoints { "/dns-query"; "/alter"; };

diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2
index bb9ee1820d09c78b0a9cc3cfb218edea77d8358c..ae213f63eaeb9e5c9a2e42775f9611781d6d0215 100644 (file)
--- a/bin/tests/system/doth/ns2/named.conf.j2
+++ b/bin/tests/system/doth/ns2/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../CA/certs/srv02.crt01.example.com.key";

diff --git a/bin/tests/system/doth/ns3/named.conf.j2 b/bin/tests/system/doth/ns3/named.conf.j2
index 857464601cfdf6e1d4d6a7cf2ab77b46cfff0700..df5a5eabd4a3644862be2377eaee13dd3bf4c864 100644 (file)
--- a/bin/tests/system/doth/ns3/named.conf.j2
+++ b/bin/tests/system/doth/ns3/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../CA/certs/srv03.crt01.example.com.key";

diff --git a/bin/tests/system/doth/ns4/named.conf.j2 b/bin/tests/system/doth/ns4/named.conf.j2
index 120cd71948a6e6254d56281fe4821a9cec051934..ccc282a288bd05ad18f3ee96247c016ea415325e 100644 (file)
--- a/bin/tests/system/doth/ns4/named.conf.j2
+++ b/bin/tests/system/doth/ns4/named.conf.j2
@@ -5,11 +5,7 @@
 # startup/reconfiguration was known to cause timeout issues in the CI
 # system, where many tests run in parallel.
 
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls local {
        key-file "../CA/certs/srv04.crt01.example.com.key";

diff --git a/bin/tests/system/doth/ns5/named.conf.j2 b/bin/tests/system/doth/ns5/named.conf.j2
index bb6ab557aac16980f6191e225053d691a5b57ab5..b01983f89e8818d144bac7b32b69405b891c1c9e 100644 (file)
--- a/bin/tests/system/doth/ns5/named.conf.j2
+++ b/bin/tests/system/doth/ns5/named.conf.j2
@@ -5,11 +5,7 @@
 # startup/reconfiguration was known to cause timeout issues in the CI
 # system, where many tests run in parallel.
 
-include "../../_common/rndc.key";
-
-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/fwdfirst/ns4/named.conf.j2 b/bin/tests/system/fwdfirst/ns4/named.conf.j2
index 46d5dd8b997e6f35ba97c790d9a5ab6ac750fdd2..6d5d29f7705aa9b5f563d192f44a6a91cc70c7f0 100644 (file)
--- a/bin/tests/system/fwdfirst/ns4/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns4/named.conf.j2
@@ -13,11 +13,7 @@ options {
        qname-minimization off;
 };
 
-controls {
-       inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/fwdfirst/ns5/named.conf.j2 b/bin/tests/system/fwdfirst/ns5/named.conf.j2
index 82068f1a94c0cd87f1824a4a81fb7f3fd3d175a8..cf3f5e9ec412198e6fcff290863aef00892cade6 100644 (file)
--- a/bin/tests/system/fwdfirst/ns5/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns5/named.conf.j2
@@ -15,11 +15,7 @@ options {
        forwarders { 10.53.0.2 port @PORT@; };
 };
 
-controls {
-       inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/inline/ns2/named.conf.j2 b/bin/tests/system/inline/ns2/named.conf.j2
index b39f69b38ac261161e03b1c348b96801937a2a16..03375a127612e6018ce83154967f6342df0b533f 100644 (file)
--- a/bin/tests/system/inline/ns2/named.conf.j2
+++ b/bin/tests/system/inline/ns2/named.conf.j2
@@ -1,10 +1,6 @@
 // NS2
 
-include "../../_common/rndc.key";
-
-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/inline/ns3/named.conf.j2 b/bin/tests/system/inline/ns3/named.conf.j2
index fd28e9da0b97812cd86e7d9e76aa4d14c5cbf20a..279bea7626995fa8061950b54f280e350fa097d5 100644 (file)
--- a/bin/tests/system/inline/ns3/named.conf.j2
+++ b/bin/tests/system/inline/ns3/named.conf.j2
@@ -1,10 +1,6 @@
 // NS3
 
-include "../../_common/rndc.key";
-
-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/inline/ns5/named.conf.j2 b/bin/tests/system/inline/ns5/named.conf.j2
index b32182781725183a8cc21c03f3c10b801e4316d4..4f547ecaedc304b8a63334782882b7a55c541bbc 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.j2
+++ b/bin/tests/system/inline/ns5/named.conf.j2
@@ -1,10 +1,6 @@
 // NS5
 
-include "../../_common/rndc.key";
-
-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/inline/ns5/named2.conf.j2 b/bin/tests/system/inline/ns5/named2.conf.j2
index 32df0e97101de7e6b5dcc18907749fd34fb22c6f..6b0578c2a355504ee4be18f85f762f0e481efb73 100644 (file)
--- a/bin/tests/system/inline/ns5/named2.conf.j2
+++ b/bin/tests/system/inline/ns5/named2.conf.j2
@@ -1,10 +1,6 @@
 // NS5
 
-include "../../_common/rndc.key";
-
-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/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2
index 11727f90294a7122d8951807d21cf6005b455e96..a780bdb5f27d03033acb71210e9931fac07997e6 100644 (file)
--- a/bin/tests/system/inline/ns6/named.conf.j2
+++ b/bin/tests/system/inline/ns6/named.conf.j2
@@ -1,10 +1,6 @@
 // NS6
 
-include "../../_common/rndc.key";
-
-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/inline/ns7/named.conf.j2 b/bin/tests/system/inline/ns7/named.conf.j2
index 1e89d28fb418a19944e2257eb2e68f866e789b6d..859bf1cf03359b93be19b966316420c2c4fe9802 100644 (file)
--- a/bin/tests/system/inline/ns7/named.conf.j2
+++ b/bin/tests/system/inline/ns7/named.conf.j2
@@ -14,11 +14,7 @@
  * one it was meant for.
  */
 
-include "../../_common/rndc.key";
-
-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/inline/ns8/named.conf.j2 b/bin/tests/system/inline/ns8/named.conf.j2
index 07f2de803d5a286c4aa3ebde88bee64ad4c6b72a..153ec12f1fe93898a386c211e388213b28c99198 100644 (file)
--- a/bin/tests/system/inline/ns8/named.conf.j2
+++ b/bin/tests/system/inline/ns8/named.conf.j2
@@ -1,10 +1,6 @@
 // NS8
 
-include "../../_common/rndc.key";
-
-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/mismatchtcp/ns1/named.conf.j2 b/bin/tests/system/mismatchtcp/ns1/named.conf.j2
index f83cb2cbc95cf9a078c2f4e6c4a590c53be7e3b6..cbd76356706c658f2c3cc012d176628c2a1e2599 100644 (file)
--- a/bin/tests/system/mismatchtcp/ns1/named.conf.j2
+++ b/bin/tests/system/mismatchtcp/ns1/named.conf.j2
@@ -11,11 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../_common/rndc.key";
-
-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/nsec3_impersonation/ns2/named.conf.j2 b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
index 2c9b0bba9e77d9be11dc33410958d78e89d74b03..c2acbe07d9e3a048b3ece8d3903f4de375116419 100644 (file)
--- a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
+++ b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
@@ -12,11 +12,7 @@ options {
        dnssec-validation yes;
 };
 
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
index 41d7f8b5b2568afeed8feeb0686682347f046905..2104ede4ccf4889c1e5160a1fe4b1aefe35a6c25 100644 (file)
--- a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
@@ -13,11 +13,7 @@ options {
        minimal-responses no;
 };
 
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
index 7da96590fe80c621813fd063cfaab9e2b3c09427..3eae8ab0ae21f9218fd16c81b742f28f16064644 100644 (file)
--- a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
@@ -13,11 +13,7 @@ options {
        synth-from-dnssec yes;
 };
 
-controls {
-       inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
index 073d3aa446b37605c787cdf11e46b7b200547fb3..5a3e2199a6a62311d10eb1254ddc8f1b0287a802 100644 (file)
--- a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
@@ -13,11 +13,7 @@ options {
        synth-from-dnssec yes;
 };
 
-controls {
-       inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
index a82f55a34494deb7feac54eadd4d40cc10fadcea..fda5b0a574d7f506c5cc1c01f65eed8b094498db 100644 (file)
--- a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
@@ -11,11 +11,7 @@ options {
        notify no;
 };
 
-controls {
-       inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
-
-include "../../_common/rndc.key";
+{% include "_common/controls.conf.j2" %}
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/proxy/ns1/named.conf.j2 b/bin/tests/system/proxy/ns1/named.conf.j2
index 671134cf649525745aac48634103170a30b6e6e0..e1bcc2cc48eec859603f9a03e1bfbe641987d62e 100644 (file)
--- a/bin/tests/system/proxy/ns1/named.conf.j2
+++ b/bin/tests/system/proxy/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/proxy/ns3/named.conf.j2 b/bin/tests/system/proxy/ns3/named.conf.j2
index 29f8159fa5c0679a7bfe531a40ae3a70756b7b9b..9c0269349298e5a9bcff50b26ec2e8471f3f8257 100644 (file)
--- a/bin/tests/system/proxy/ns3/named.conf.j2
+++ b/bin/tests/system/proxy/ns3/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
index de5bc095f7cbe9f685f6b919f99880a527048453..63af1656d2b004da0d984f9f2ee304ed37f000a8 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/ns3/named2.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
index b0128ae8f0267765d33792bbbfc6f50c2c47e387..bda6f5ab3d475218bcdd94ffb909d23300f11e7b 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/ns3/named3.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
index e869f2774fa2c39e84aa019acf61d22623526cb1..cb526293acbceb12ccb5572d57a5c532b2c0981f 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/timeouts/ns1/named.conf.j2 b/bin/tests/system/timeouts/ns1/named.conf.j2
index a1ed1a350769d216644fb5a513b5cfa41e1ce61b..bca9e0a38044be75b307402465e39f230063f06d 100644 (file)
--- a/bin/tests/system/timeouts/ns1/named.conf.j2
+++ b/bin/tests/system/timeouts/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/transport_acl/ns1/named.conf.j2 b/bin/tests/system/transport_acl/ns1/named.conf.j2
index c9a4342e48f23c89d2589a1db34ce108b6afd548..16536ab56949dd22d47431100769e585f10d357b 100644 (file)
--- a/bin/tests/system/transport_acl/ns1/named.conf.j2
+++ b/bin/tests/system/transport_acl/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2 b/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2
index 16aff0f2c4b390c5dc72828a0f60bac74b6f2193..7283bd46bc7460dd504d92e4241fbf531eff4190 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-http-plain-proxy.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2
index f096943d81ec6028e8c36e96241d16accde06ca5..46cbfaea180f24931e3c6a7a4fa527fffe1772e2 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-http-plain.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2 b/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2
index 97ddd92fa2c18937eb2bd4594a4dfe8e5ad121aa..5d66158b57d900a37e838bfff1682443c4f61618 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-https-proxy-encrypted.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2
index 582c6fc30bf1b655aa608ad7bb2d89bba821452a..f9811d33b977ca3a51b344515e453f61070e2f9b 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-https-proxy-plain.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-https.conf.j2 b/bin/tests/system/transport_change/ns1/named-https.conf.j2
index 1b88d5feb4bd127535e1a53e0185b0a08c9884cb..4b1f74974c43ff15c92504f9b150e7085f0c3050 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-https.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-https.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-proxy.conf.j2 b/bin/tests/system/transport_change/ns1/named-proxy.conf.j2
index c7d605d1f9fbd8b55f34e2583804009b96e89c50..59d38fc08d4beca3e1254650c501b9f5ce1bf5b2 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-proxy.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-proxy.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2
index 68543271586370155d1b611988173195b1f9aaf1..e377041c212f0f3b8edfb582aa68567e098664fd 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-tls-proxy-encrypted.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2
index dde4c4947b172716322a7e423a7e5499a4e03c1b..e2165168c31e067fed25320cb028230143ec819a 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-tls-proxy-plain.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named-tls.conf.j2 b/bin/tests/system/transport_change/ns1/named-tls.conf.j2
index e3c5cab2bf9d54aabe8fda4143259ffdd099a9c1..5289a53f7e65f08d5a6ccbad35bd9d47b24364af 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named-tls.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named-tls.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/transport_change/ns1/named.conf.j2 b/bin/tests/system/transport_change/ns1/named.conf.j2
index 928faf22d9b9868181a372e801f5e63f7aa9a6c8..0dfa67ba134c5191399bca97a53c4fd28ed8a0a9 100644 (file)
--- a/bin/tests/system/transport_change/ns1/named.conf.j2
+++ b/bin/tests/system/transport_change/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-controls {
-       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
+{% include "_common/controls.conf.j2" %}
 
 tls self-signed {
        cert-file "../self-signed-cert.pem";

diff --git a/bin/tests/system/xfer/ns1/named.conf.j2 b/bin/tests/system/xfer/ns1/named.conf.j2
index 5a57aa6b14a9bc8bc51e636a088cf0b6d09031eb..8e917454119fc2179e67a3cd8f33681f98205571 100644 (file)
--- a/bin/tests/system/xfer/ns1/named.conf.j2
+++ b/bin/tests/system/xfer/ns1/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/xfer/ns1/named2.conf.j2 b/bin/tests/system/xfer/ns1/named2.conf.j2
index 69601c5b465e4943631ff94fafcc5272dc372d97..893155b100117f02846232b219454cc1bd24d4cd 100644 (file)
--- a/bin/tests/system/xfer/ns1/named2.conf.j2
+++ b/bin/tests/system/xfer/ns1/named2.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/xfer/ns1/named3.conf.j2 b/bin/tests/system/xfer/ns1/named3.conf.j2
index 8716a9449b7c1035699c8002b76c25f22c942f5a..d4c9888eb7f31e17265ed2dff03af6a302df7be1 100644 (file)
--- a/bin/tests/system/xfer/ns1/named3.conf.j2
+++ b/bin/tests/system/xfer/ns1/named3.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/xfer/ns6/named.conf.j2 b/bin/tests/system/xfer/ns6/named.conf.j2
index ba27db1539a05bf74ff663d3f4189ff808ed1f26..be713388c049e5cd9f52c1000e34829638084b45 100644 (file)
--- a/bin/tests/system/xfer/ns6/named.conf.j2
+++ b/bin/tests/system/xfer/ns6/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/xfer/ns7/named.conf.j2 b/bin/tests/system/xfer/ns7/named.conf.j2
index ec2f3982be0c42e3a212f2242dd332745bf97a7c..d8acedc94b3fff469e5b5c4512b9fcf26ca4d00c 100644 (file)
--- a/bin/tests/system/xfer/ns7/named.conf.j2
+++ b/bin/tests/system/xfer/ns7/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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/xfer/ns8/named.conf.j2 b/bin/tests/system/xfer/ns8/named.conf.j2
index 9cd83a385a89c11ab42430ee5788b0d953364157..3c020ef14a131086a3f5101459b6842b7e3ce4ca 100644 (file)
--- a/bin/tests/system/xfer/ns8/named.conf.j2
+++ b/bin/tests/system/xfer/ns8/named.conf.j2
@@ -1,8 +1,4 @@
-include "../../_common/rndc.key";
-
-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;