Use the shared options template for standard plumbing

Every options block carrying all seven standard plumbing statements
gets the _common/options.conf.j2 umbrella include at the top of the
block instead. Statement order inside options has no meaning to named,
so rendered configs are equivalent.

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 2e21dd1f2a9e85dc7bf97578d2eb012556e23c3a..c67e29d2b794f9cc81ea71686e9286f8150cc04c 100644 (file)
--- a/bin/tests/system/acl/ns2/named.conf.j2
+++ b/bin/tests/system/acl/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/acl/ns2/named2.conf.j2 b/bin/tests/system/acl/ns2/named2.conf.j2
index 46d272fd2bab331f2c6018fc2440ea8b8d296ba4..0bda32e0fe18e397d5d282eb84f5b2d02a38fe2a 100644 (file)
--- a/bin/tests/system/acl/ns2/named2.conf.j2
+++ b/bin/tests/system/acl/ns2/named2.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2
index c8c1200b674e12971d46911fe2be929d42ff4df1..92d26f7671d8c82fd9d964001e1958dfecfea291 100644 (file)
--- a/bin/tests/system/acl/ns2/named3.conf.j2
+++ b/bin/tests/system/acl/ns2/named3.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2
index 10b1807186b240e955410849d7430ec6a9df5a65..a853cd4e793a5e716cb7514cbbb22656836a9a29 100644 (file)
--- a/bin/tests/system/acl/ns2/named4.conf.j2
+++ b/bin/tests/system/acl/ns2/named4.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2
index b9c908eea33b96aa0d6cfc02ac3a9701a44d0263..baad0db74eca22d3d1449f883951d9e2351985cd 100644 (file)
--- a/bin/tests/system/acl/ns2/named5.conf.j2
+++ b/bin/tests/system/acl/ns2/named5.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/acl/ns3/named.conf.j2 b/bin/tests/system/acl/ns3/named.conf.j2
index 2bcad4b4793815ba01df6302956994b8853a23ff..4bdb1c455e678a140f5530d51f2ee02c69fb830a 100644 (file)
--- a/bin/tests/system/acl/ns3/named.conf.j2
+++ b/bin/tests/system/acl/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        allow-new-zones yes;

diff --git a/bin/tests/system/acl/ns4/named.conf.j2 b/bin/tests/system/acl/ns4/named.conf.j2
index 2768fa40857eae55b3f7dc6b1b2c0ad16d2406df..368dd059e4b005f956eab48b0a299856646d0b38 100644 (file)
--- a/bin/tests/system/acl/ns4/named.conf.j2
+++ b/bin/tests/system/acl/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        allow-new-zones yes;

diff --git a/bin/tests/system/additional/ns1/named.conf.j2 b/bin/tests/system/additional/ns1/named.conf.j2
index 54ecef1c393fdfbc68862a8d448334d19132f078..263cf03478ee4653052ec5c2cf50dad2d25d95b5 100644 (file)
--- a/bin/tests/system/additional/ns1/named.conf.j2
+++ b/bin/tests/system/additional/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        notify no;
        minimal-responses yes;
 };

diff --git a/bin/tests/system/additional/ns1/named2.conf.j2 b/bin/tests/system/additional/ns1/named2.conf.j2
index aea12f5f5b6265928edf0996bf2cf59ca997b813..1184bc986f4d7b0f4482c622225ab3eb8153dfe1 100644 (file)
--- a/bin/tests/system/additional/ns1/named2.conf.j2
+++ b/bin/tests/system/additional/ns1/named2.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        notify no;
        minimal-responses no;
 };

diff --git a/bin/tests/system/additional/ns1/named3.conf.j2 b/bin/tests/system/additional/ns1/named3.conf.j2
index 5635854b419fd9338df16397d45ba67b60dc118b..c16e82eebc131006b1f4ed9acf1de64eff9aa8c9 100644 (file)
--- a/bin/tests/system/additional/ns1/named3.conf.j2
+++ b/bin/tests/system/additional/ns1/named3.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        notify no;
        minimal-any yes;
        minimal-responses no-auth;

diff --git a/bin/tests/system/additional/ns1/named4.conf.j2 b/bin/tests/system/additional/ns1/named4.conf.j2
index 04819375469abd2fbce13e20bc8f63616b8f49ee..6a0c8c4b80d772f8de93e519a3e607178b8617d1 100644 (file)
--- a/bin/tests/system/additional/ns1/named4.conf.j2
+++ b/bin/tests/system/additional/ns1/named4.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        notify no;
        minimal-responses no-auth-recursive;
 };

diff --git a/bin/tests/system/additional/ns2/named.conf.j2 b/bin/tests/system/additional/ns2/named.conf.j2
index 4229330f360b7f7c077b36e8678eb750d867d863..258e43b6ec9a657c36474e3f1f2ad529615fa284 100644 (file)
--- a/bin/tests/system/additional/ns2/named.conf.j2
+++ b/bin/tests/system/additional/ns2/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        notify no;
        minimal-responses yes;
        dnssec-validation no;

diff --git a/bin/tests/system/additional/ns3/named.conf.j2 b/bin/tests/system/additional/ns3/named.conf.j2
index 1b802bb2cf21831b00201a51365c9996236e52ec..8ec3f68167801a5a0ac7ce6d3bef14c0e0ecf1d4 100644 (file)
--- a/bin/tests/system/additional/ns3/named.conf.j2
+++ b/bin/tests/system/additional/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        minimal-responses no;
 };

diff --git a/bin/tests/system/addzone/ns1/named.conf.j2 b/bin/tests/system/addzone/ns1/named.conf.j2
index fde742af4e6abfb6f803d709107bd58d25d72978..09f9c44dbd5f301e46a58e658e5f25f0812a86b7 100644 (file)
--- a/bin/tests/system/addzone/ns1/named.conf.j2
+++ b/bin/tests/system/addzone/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        allow-query { any; };
 {% if allownewzones %}

diff --git a/bin/tests/system/addzone/ns2/named.conf.j2 b/bin/tests/system/addzone/ns2/named.conf.j2
index 835754d48e2680200a8a0078710c792814f38a2b..5f909bcb656e79b139087f805f2acef041882746 100644 (file)
--- a/bin/tests/system/addzone/ns2/named.conf.j2
+++ b/bin/tests/system/addzone/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        recursion no;
        allow-new-zones yes;

diff --git a/bin/tests/system/addzone/ns3/named.conf.j2 b/bin/tests/system/addzone/ns3/named.conf.j2
index 30101ba38c691a89b8dbe75805d5a3153d2f9e8c..2c3090693699f36b844ded206e360f8eaadc428c 100644 (file)
--- a/bin/tests/system/addzone/ns3/named.conf.j2
+++ b/bin/tests/system/addzone/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        allow-transfer { any; };
        recursion no;

diff --git a/bin/tests/system/addzone/ns3/named2.conf.j2 b/bin/tests/system/addzone/ns3/named2.conf.j2
index 7af5d5aa39c1ae020ba6fbade00d8a74c63fa6af..874a47bfc05cec4e8f49fc1bcb13dc20d1cdd93e 100644 (file)
--- a/bin/tests/system/addzone/ns3/named2.conf.j2
+++ b/bin/tests/system/addzone/ns3/named2.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        allow-transfer { any; };
        recursion no;

diff --git a/bin/tests/system/allow_query/ns1/named.conf.j2 b/bin/tests/system/allow_query/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/allow_query/ns1/named.conf.j2
+++ b/bin/tests/system/allow_query/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named.conf.j2 b/bin/tests/system/allow_query/ns2/named.conf.j2
index d21b6bedfe898d03e84b9497df0cc86dad501b2d..038fc32c3398cbf4e179db51685581790dc602d7 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named02.conf.j2 b/bin/tests/system/allow_query/ns2/named02.conf.j2
index 5064d9040414e590e963406717946a288f70d59a..b300cbe2ca9c8dc9cafc9901fb3fca1fbc4b978f 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named02.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named02.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { any; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named03.conf.j2 b/bin/tests/system/allow_query/ns2/named03.conf.j2
index c9597b18ad48c092a488438460e57c8e3123defd..ceacd8992b3dbaa4f7b35f7cd79b78fd99a6ebe4 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named03.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named03.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { none; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named04.conf.j2 b/bin/tests/system/allow_query/ns2/named04.conf.j2
index fc4dd1ce4f1821a180c23ac835f05e86d31b3405..96f0581e4f66b81f9d91c920d750dd5336e1c9a7 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named04.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named04.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { 10.53.0.2; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named05.conf.j2 b/bin/tests/system/allow_query/ns2/named05.conf.j2
index 6e59c5bbb10be4b4a3cdc83236a3fa83213504a8..3d5a7308877df18414122acdec5af3457e9818e2 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named05.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named05.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { 10.53.0.1; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named06.conf.j2 b/bin/tests/system/allow_query/ns2/named06.conf.j2
index 409312ece3b79062c720b83078fec299c6ff34bc..a80954685bed1594195df63ce4379f7144c7b198 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named06.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named06.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query {! 10.53.0.2; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named07.conf.j2 b/bin/tests/system/allow_query/ns2/named07.conf.j2
index a8c9ceb9cf4919ebdf144f8bc50b7f03e604f9f1..b2dfcec378753745591a6b8c7667a766261b954b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named07.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named07.conf.j2
@@ -1,13 +1,7 @@
 acl accept { 10.53.0.2; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { accept; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named08.conf.j2 b/bin/tests/system/allow_query/ns2/named08.conf.j2
index 2cfae20f8c505b483d6d2463d4cb18cfd9d80846..d90a8f5dcc62529dc3753b0e6d781dccefe0362f 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named08.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named08.conf.j2
@@ -1,13 +1,7 @@
 acl accept { 10.53.0.1; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { accept; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named09.conf.j2 b/bin/tests/system/allow_query/ns2/named09.conf.j2
index 7e4e6a1dbe548e019e94647894c8291b6046b14a..4601cf3b77589c079edd27e5feca0fef80d94f9e 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named09.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named09.conf.j2
@@ -1,13 +1,7 @@
 acl accept { 10.53.0.2; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query {! accept; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named10.conf.j2 b/bin/tests/system/allow_query/ns2/named10.conf.j2
index 1a1735ce228d5ef91442124167cee2bc0041787b..51f7317853d3a8636f49e52056f3d83dad95be98 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named10.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named10.conf.j2
@@ -4,13 +4,7 @@ key one {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { key one; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named11.conf.j2 b/bin/tests/system/allow_query/ns2/named11.conf.j2
index b8f14699712249e5fb95ca2616b24a0f245dde24..a6b9fc3a517e2e08c4a165ec42c7d0dcc0292110 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named11.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named11.conf.j2
@@ -10,13 +10,7 @@ key two {
 
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { key one; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named12.conf.j2 b/bin/tests/system/allow_query/ns2/named12.conf.j2
index 2bcda1e31e472fb5a3a20973b55430bbecd14917..1dd296d7f1cbe6d16a6e9e2facda197454abeffb 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named12.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named12.conf.j2
@@ -4,13 +4,7 @@ key one {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query {! key one; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named21.conf.j2 b/bin/tests/system/allow_query/ns2/named21.conf.j2
index 0c148056ed82131ed75b967bf6e1268212a1ce0d..e4c2eaf634becaa7c1c19770e0bb752d0c880eb0 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named21.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named21.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named22.conf.j2 b/bin/tests/system/allow_query/ns2/named22.conf.j2
index 100f2204b19a8041e16f1b0e10f4793d35d01598..2b64844bd6011aeafdeea5e4cbaf24fa15d768f1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named22.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named22.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named23.conf.j2 b/bin/tests/system/allow_query/ns2/named23.conf.j2
index 7295b925eb74561feb94db1367cb6bf8a7b94682..fa508308d23e39bd528af65dbd871b614a2b0b1a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named23.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named23.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named24.conf.j2 b/bin/tests/system/allow_query/ns2/named24.conf.j2
index ad13e05063347d9422fda3c6200cf11767771fb2..1cfbdeb9e999c88cb5d619d510a3e6c141aa9ae3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named24.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named24.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named25.conf.j2 b/bin/tests/system/allow_query/ns2/named25.conf.j2
index beda482e30c0083873c161fe15021b1222f32def..37e24c72656d53310abdb9ba9e0eaf7d92a15091 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named25.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named25.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named26.conf.j2 b/bin/tests/system/allow_query/ns2/named26.conf.j2
index eb189ed5134a27c70708f737582f1daa7e3d11f7..4af789c6b3ae03db448025aa18630aa39b7407e1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named26.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named26.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named27.conf.j2 b/bin/tests/system/allow_query/ns2/named27.conf.j2
index 47b8a251fe376cdd11f4c87c7ff88823348a2b73..b8e1d4e91c30fac50a55db103b42dc913bd926e4 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named27.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named27.conf.j2
@@ -1,13 +1,7 @@
 acl accept { 10.53.0.2; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named28.conf.j2 b/bin/tests/system/allow_query/ns2/named28.conf.j2
index 53a380769a11b1a8a6652c304e83c283b56e6703..53665846b36c341a730a982eb56bf813b84c6e03 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named28.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named28.conf.j2
@@ -1,13 +1,7 @@
 acl accept { 10.53.0.1; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named29.conf.j2 b/bin/tests/system/allow_query/ns2/named29.conf.j2
index 38190beeb9cca6d5dfe363997418598515fa200a..6aa26b9d3a607073659733c4b219e9b94fc17bff 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named29.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named29.conf.j2
@@ -1,13 +1,7 @@
 acl accept { 10.53.0.2; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named30.conf.j2 b/bin/tests/system/allow_query/ns2/named30.conf.j2
index 931d610af1e2cff06ef75340ca9e2fb494039a84..77880a8554986c3313ad32acdf8a013097d82d0f 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named30.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named30.conf.j2
@@ -4,13 +4,7 @@ key one {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named31.conf.j2 b/bin/tests/system/allow_query/ns2/named31.conf.j2
index c66c927b7f036f7f077881361224bed733d97a71..c26a669c62a1a2714fd4d3c1907de3d517b68068 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named31.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named31.conf.j2
@@ -10,13 +10,7 @@ key two {
 
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { key one; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named32.conf.j2 b/bin/tests/system/allow_query/ns2/named32.conf.j2
index 621e78f95dba826f0c1541081db74923a955b089..0bceaf541471fbb301ecb64422fe59e30a87bf81 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named32.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named32.conf.j2
@@ -4,13 +4,7 @@ key one {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named33.conf.j2 b/bin/tests/system/allow_query/ns2/named33.conf.j2
index 37718e8fb770e388b4b89fd579f2b3aada6bf19c..1c02e6d4605ee8c44a545d15a3946cba9592415a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named33.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named33.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { none; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named34.conf.j2 b/bin/tests/system/allow_query/ns2/named34.conf.j2
index 5a6a7f16b226d692b98185ea294e4a9cae598df1..d9196a032649a393443a9b2f6100e30cc55951a8 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named34.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named34.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { any; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named40.conf.j2 b/bin/tests/system/allow_query/ns2/named40.conf.j2
index d7aadfcb3ead229b0878a6edb3485ba34deba582..1ffefb890976d4772a6d86bebcd1e97dd647dd66 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named40.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named40.conf.j2
@@ -13,13 +13,7 @@ key two {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named53.conf.j2 b/bin/tests/system/allow_query/ns2/named53.conf.j2
index b1625412cebaec576e5b4ff35023076e97fb0cce..666afedb4c75e2b0cc612f4fa48d76fa59ae4748 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named53.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named53.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { none; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named54.conf.j2 b/bin/tests/system/allow_query/ns2/named54.conf.j2
index 4cbd2005832df70d116e1ea9d9bc86251dc6412e..d8181e95b1ca8c6f5dd7cee58517765a8f458a5f 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named54.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named54.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query { any; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns2/named55.conf.j2 b/bin/tests/system/allow_query/ns2/named55.conf.j2
index 2e2c0339287566f45df46e0f0c1f8af2486b57a7..7d010e65177497d5b1b686f3ff56ec73293db761 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named55.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named55.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named56.conf.j2 b/bin/tests/system/allow_query/ns2/named56.conf.j2
index 6721e0ad313a87b5c8e27cc43c50d847f0482453..a3e67aea9d3ad5a350a6b7e4ab9989e6e166071b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named56.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named56.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns2/named57.conf.j2 b/bin/tests/system/allow_query/ns2/named57.conf.j2
index 578b36a8d3fd95f66b10b4392c1dccccf5d959f7..9fe197cd23ba8a40507bf1c6a1b8e4c114ec21b5 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named57.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named57.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/allow_query/ns3/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2
index 398cd6f8773cd4cfa01d8b17dcc4dbf04a340127..1aff3cc702214c97bf70d40dc82cdc580fe542ec 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2
index ad22b9c8135fc470774fa96951b27eb2e0666ec4..9ee2442873e5cacb549f2c1f2974ed479c7a5f82 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named2.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { any; };
        allow-recursion-on { none; };
        allow-query-cache-on { 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 a3934a11687a5465b159405280fc033f93a031bf..1343c4faa7afd1eae7c4aea17114c25ac94d2804 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named6.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named6.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-query-cache { none; };
        dnssec-validation no;

diff --git a/bin/tests/system/allow_query/ns3/named7.conf.j2 b/bin/tests/system/allow_query/ns3/named7.conf.j2
index a1144ac33a231f675a837eb52dd9f84dace2cf53..d50070019dbb8804c5af062bbd007211afdd9f55 100644 (file)
--- a/bin/tests/system/allow_query/ns3/named7.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named7.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-recursion { none; };
        dnssec-validation no;

diff --git a/bin/tests/system/auth/ns1/named.conf.j2 b/bin/tests/system/auth/ns1/named.conf.j2
index b31aaa1a2746bdcce2dd382a894f2376b3310a88..77b2d7e614ec04848a795298d4388f128aec2515 100644 (file)
--- a/bin/tests/system/auth/ns1/named.conf.j2
+++ b/bin/tests/system/auth/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        send-report-channel "example.rad";

diff --git a/bin/tests/system/auth/ns2/named.conf.j2 b/bin/tests/system/auth/ns2/named.conf.j2
index 32331f0cfb9b2733d1e00d6a653cfe000e1ab15c..9f02cd0de5799c7468a01f5b0b0e0685bd3255aa 100644 (file)
--- a/bin/tests/system/auth/ns2/named.conf.j2
+++ b/bin/tests/system/auth/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/auth_res_deleg/ns1/named.conf.j2
+++ b/bin/tests/system/auth_res_deleg/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

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 46629ab8263fd61f260dfb1a549b3346b37cba7a..130f9493edccdd3f83456f7650910e604b25f401 100644 (file)
--- a/bin/tests/system/auth_res_deleg/ns2/named.conf.j2
+++ b/bin/tests/system/auth_res_deleg/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dnstap { resolver query; };
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2 b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2
index 6fad958c66bc601355b3c54ed56817a15c1858db..0cbc9a014fc1c3772f571667f86a518b56160950 100644 (file)
--- a/bin/tests/system/auth_res_deleg/ns3/named.conf.j2
+++ b/bin/tests/system/auth_res_deleg/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/autosign/ns1/named.conf.j2 b/bin/tests/system/autosign/ns1/named.conf.j2
index d706707419a20b2db507d0b3fc4baf325b46cd60..ff3cb0560a5505a5224b2dc75f702fbfec4bb0bc 100644 (file)
--- a/bin/tests/system/autosign/ns1/named.conf.j2
+++ b/bin/tests/system/autosign/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation yes;

diff --git a/bin/tests/system/autosign/ns2/named.conf.j2 b/bin/tests/system/autosign/ns2/named.conf.j2
index 916a9d4417b42bf59a6228549221e3535245284a..a09bbcf3d7c1b11f85ce14c22669fa2f8cb719f5 100644 (file)
--- a/bin/tests/system/autosign/ns2/named.conf.j2
+++ b/bin/tests/system/autosign/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation yes;

diff --git a/bin/tests/system/autosign/ns3/named.conf.j2 b/bin/tests/system/autosign/ns3/named.conf.j2
index 1626da485767711f0cbecfe01b9e6d8d007fb9c4..06e13e9bf5d54710ec7f3401da57334d49af5178 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.j2
+++ b/bin/tests/system/autosign/ns3/named.conf.j2
@@ -1,14 +1,8 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        recursion no;
        dnssec-validation yes;

diff --git a/bin/tests/system/autosign/ns4/named.conf.j2 b/bin/tests/system/autosign/ns4/named.conf.j2
index a427603ea0aa991065cb216e032f08f8e7cb39e1..53201e9d4a9ea64391aa98a1b5e470f640e1b171 100644 (file)
--- a/bin/tests/system/autosign/ns4/named.conf.j2
+++ b/bin/tests/system/autosign/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/autosign/ns5/named.conf.j2 b/bin/tests/system/autosign/ns5/named.conf.j2
index 48032d8dbb7f26a923ff33bad1cb6fad6405a6d0..a1774fd5a9ee1e3343b0e4028f2adc48ca52ec71 100644 (file)
--- a/bin/tests/system/autosign/ns5/named.conf.j2
+++ b/bin/tests/system/autosign/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/bailiwick/ns4/named.conf.j2 b/bin/tests/system/bailiwick/ns4/named.conf.j2
index fb5bd7907644cb15021c714e294b2e609ff996dd..c3b0e86f05feb591cf0e53ee7eb1d8f0ad706ca0 100644 (file)
--- a/bin/tests/system/bailiwick/ns4/named.conf.j2
+++ b/bin/tests/system/bailiwick/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        qname-minimization off;
 };

diff --git a/bin/tests/system/builtin/ns1/named.conf.j2 b/bin/tests/system/builtin/ns1/named.conf.j2
index 0586ddf6fd1020a2bd6ee83803347ab2680b73e0..0458272f95b9735792368c26011dbd132df11133 100644 (file)
--- a/bin/tests/system/builtin/ns1/named.conf.j2
+++ b/bin/tests/system/builtin/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/builtin/ns2/named.conf.j2 b/bin/tests/system/builtin/ns2/named.conf.j2
index d4dd416d32ea2be5aabdb959b91480a30ac113a1..79092131b78606337cd344eb220b9f2db960f65a 100644 (file)
--- a/bin/tests/system/builtin/ns2/named.conf.j2
+++ b/bin/tests/system/builtin/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        server-id hostname;
        dnssec-validation no;

diff --git a/bin/tests/system/builtin/ns3/named.conf.j2 b/bin/tests/system/builtin/ns3/named.conf.j2
index 58a512a9ff17ed864ec8ad4c470ed467286dc426..6b329bea2b3e1176b08c0dd9a081670eb5989723 100644 (file)
--- a/bin/tests/system/builtin/ns3/named.conf.j2
+++ b/bin/tests/system/builtin/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        hostname "this.is.a.test.of.hostname";
        server-id "this.is.a.test.of.server-id";

diff --git a/bin/tests/system/cacheclean/ns1/named.conf.j2 b/bin/tests/system/cacheclean/ns1/named.conf.j2
index 598f3c35d3145dc2a21a56320474e9122fcef327..07516a36bf1c3fff334d2d3032ba2f412b0ad779 100644 (file)
--- a/bin/tests/system/cacheclean/ns1/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2
index 802dcf6f55fc9dad9036d9d59b63cf12d03614e3..2e5791bf26b90b16f93b3c96a53741d467f60598 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        disable-empty-zone 127.IN-ADDR.ARPA;
        dnssec-validation no;
 

diff --git a/bin/tests/system/cacheclean/ns3/named.conf.j2 b/bin/tests/system/cacheclean/ns3/named.conf.j2
index 38f813c132240129a3132290d463c10ad9ea06da..ac0b5b2e00dcd662f919cfe1eeba569428273136 100644 (file)
--- a/bin/tests/system/cacheclean/ns3/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/camp/ns1/named.conf.j2 b/bin/tests/system/camp/ns1/named.conf.j2
index 9f6d74fdbe80533671eef571d34c6a6878622347..b1e068c3d03936d652e39eb372ec4b7b368e5750 100644 (file)
--- a/bin/tests/system/camp/ns1/named.conf.j2
+++ b/bin/tests/system/camp/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/camp/ns2/named.conf.j2 b/bin/tests/system/camp/ns2/named.conf.j2
index 76d2db22ef524f756a25a145a78dd6d76dadf870..9ba72e4622c7a0075287fbf0755e3f8d4e257909 100644 (file)
--- a/bin/tests/system/camp/ns2/named.conf.j2
+++ b/bin/tests/system/camp/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/camp/ns3/named.conf.j2 b/bin/tests/system/camp/ns3/named.conf.j2
index 5359e991a7cbee1d40ddf275ea75af5f7bb932c5..28259dca4885adb8ea04ed5a4a6b7d5ce475424e 100644 (file)
--- a/bin/tests/system/camp/ns3/named.conf.j2
+++ b/bin/tests/system/camp/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 
        max-query-count 150;

diff --git a/bin/tests/system/camp/ns9/named.conf.j2 b/bin/tests/system/camp/ns9/named.conf.j2
index c17f25f2ead090094bbb51bb506c458172be3d54..5c8365c29a7e0f94f9ca4ea58f308a4fb1200d91 100644 (file)
--- a/bin/tests/system/camp/ns9/named.conf.j2
+++ b/bin/tests/system/camp/ns9/named.conf.j2
@@ -1,13 +1,7 @@
 // NS9
 
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 
        max-recursion-queries 50;

diff --git a/bin/tests/system/cap_glues/ns1/named.conf.j2 b/bin/tests/system/cap_glues/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/cap_glues/ns1/named.conf.j2
+++ b/bin/tests/system/cap_glues/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/cap_glues/ns2/named.conf.j2 b/bin/tests/system/cap_glues/ns2/named.conf.j2
index 6f5986d7f0cc914176930642bfe3dded9ea66909..b63235273d241becb97c75005851e6830a4b7666 100644 (file)
--- a/bin/tests/system/cap_glues/ns2/named.conf.j2
+++ b/bin/tests/system/cap_glues/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/cap_glues/ns3/named.conf.j2 b/bin/tests/system/cap_glues/ns3/named.conf.j2
index f677533bf23d13da7a33e5b4be52e0678337eb27..da196ad9f348705e3b0217d79cf5f649068213ce 100644 (file)
--- a/bin/tests/system/cap_glues/ns3/named.conf.j2
+++ b/bin/tests/system/cap_glues/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/case/ns1/named.conf.j2 b/bin/tests/system/case/ns1/named.conf.j2
index 5600daac5b3ecf54e3451d1917607e28cb9983b9..4790d65d211afe87c16ebf3bcf299658149fa034 100644 (file)
--- a/bin/tests/system/case/ns1/named.conf.j2
+++ b/bin/tests/system/case/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/case/ns2/named.conf.j2 b/bin/tests/system/case/ns2/named.conf.j2
index 11a111cd34c1722a2839d64c464124a25e647b9c..1b13568597268da6c74adfcc694d4f8072434385 100644 (file)
--- a/bin/tests/system/case/ns2/named.conf.j2
+++ b/bin/tests/system/case/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/catz/ns1/named.conf.j2 b/bin/tests/system/catz/ns1/named.conf.j2
index 77d1441591504228d40e846a725b94f33e40e6b3..0c7d24855a1d1cc3d144979d0fe47311e25240c8 100644 (file)
--- a/bin/tests/system/catz/ns1/named.conf.j2
+++ b/bin/tests/system/catz/ns1/named.conf.j2
@@ -1,17 +1,11 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
        allow-new-zones yes;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
        listen-on port @EXTRAPORT1@ { 10.53.0.1; };
        listen-on tls ephemeral { 10.53.0.1; };
-       listen-on-v6 { none; };
        notify no;
        notify-delay 0;
        recursion no;

diff --git a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 b/bin/tests/system/cdnxdomain/ns1/named.conf.j2
index c00acaedbbd708d37b2020050dff8887242e8447..ca30edca58e63ba73f0b2bf171df5ba64bd55856 100644 (file)
--- a/bin/tests/system/cdnxdomain/ns1/named.conf.j2
+++ b/bin/tests/system/cdnxdomain/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        servfail-ttl 0;
 };

diff --git a/bin/tests/system/cdnxdomain/ns2/named.conf.j2 b/bin/tests/system/cdnxdomain/ns2/named.conf.j2
index 4624efedf08d29cb483555639fda26bbbf048a89..fd46284f6175127bbc230d7f2ddaf33e06702adf 100644 (file)
--- a/bin/tests/system/cdnxdomain/ns2/named.conf.j2
+++ b/bin/tests/system/cdnxdomain/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/chain/ns1/named.conf.j2 b/bin/tests/system/chain/ns1/named.conf.j2
index 738186cf027c7ebfcfc7b8be54c9437ecbb00161..596a1edd33b19dd6f394532e3024320c6f95c2b4 100644 (file)
--- a/bin/tests/system/chain/ns1/named.conf.j2
+++ b/bin/tests/system/chain/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/chain/ns2/named.conf.j2 b/bin/tests/system/chain/ns2/named.conf.j2
index 2521e21951ea53ce44af8d058e55731581a1a60f..ae49e812734efec654ef21c7e8e46c377d21c6a5 100644 (file)
--- a/bin/tests/system/chain/ns2/named.conf.j2
+++ b/bin/tests/system/chain/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/chain/ns5/named.conf.j2 b/bin/tests/system/chain/ns5/named.conf.j2
index d0888a8ca6935ee65511f0a24fd1d7e2a34efdb9..dfc7e3efdade791a25df6573b59383d259146118 100644 (file)
--- a/bin/tests/system/chain/ns5/named.conf.j2
+++ b/bin/tests/system/chain/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/chase_ds/ns1/named.conf.j2 b/bin/tests/system/chase_ds/ns1/named.conf.j2
index 647a42d8b7c5cec1dad8cd51739909bc75657891..4dcda49386c343abc6b683c33ed75ae0e013ab73 100644 (file)
--- a/bin/tests/system/chase_ds/ns1/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/chase_ds/ns2/named.conf.j2 b/bin/tests/system/chase_ds/ns2/named.conf.j2
index a74025b19227414e2e60d788972eec14c94f0402..55c99ef8f30555dbb3e41682df7e74c13cee3e0c 100644 (file)
--- a/bin/tests/system/chase_ds/ns2/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/chase_ds/ns3/named.conf.j2 b/bin/tests/system/chase_ds/ns3/named.conf.j2
index 7faf9669c2d8a6d1ec97b28864f195d5ebefb24d..e8f5da5ba1aa03f427b4676943303abf281f128f 100644 (file)
--- a/bin/tests/system/chase_ds/ns3/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/checkds/ns1/named.conf.j2 b/bin/tests/system/checkds/ns1/named.conf.j2
index 63222df496cc54e34c18ed9bd3561a92db0255b7..b8483522c7d11b4ef7448afa61284e5152bb9827 100644 (file)
--- a/bin/tests/system/checkds/ns1/named.conf.j2
+++ b/bin/tests/system/checkds/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/checkds/ns10/named.conf.j2 b/bin/tests/system/checkds/ns10/named.conf.j2
index 1f971d3e7df55087fcee58bfe5183b9c1885b705..a8aae77dc539cad88b769f8f90b8f350282d25fc 100644 (file)
--- a/bin/tests/system/checkds/ns10/named.conf.j2
+++ b/bin/tests/system/checkds/ns10/named.conf.j2
@@ -1,13 +1,7 @@
 // NS10
 
 options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.10; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns2/named.conf.j2 b/bin/tests/system/checkds/ns2/named.conf.j2
index d92f1b6fc47ceef79a8c35ec0690b7272515bf99..c893b95bec5acdeb2b9cee8833aef808cc1b519d 100644 (file)
--- a/bin/tests/system/checkds/ns2/named.conf.j2
+++ b/bin/tests/system/checkds/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns3/named.conf.j2 b/bin/tests/system/checkds/ns3/named.conf.j2
index 53ea6e909de8dbf7dc3e84f02948b1273635b8a6..c0d82f5fa44e1352d1c8f8c14eaf9036bcdd6396 100644 (file)
--- a/bin/tests/system/checkds/ns3/named.conf.j2
+++ b/bin/tests/system/checkds/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       query-source address 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        session-keyfile "session.key";
 };

diff --git a/bin/tests/system/checkds/ns4/named.conf.j2 b/bin/tests/system/checkds/ns4/named.conf.j2
index 24dd9ea86c66a4c09d6dfef03d9ecf0f1c4bb0a9..963b1c0cf257596cdf03b505da79d0a53d7a4ad3 100644 (file)
--- a/bin/tests/system/checkds/ns4/named.conf.j2
+++ b/bin/tests/system/checkds/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns5/named.conf.j2 b/bin/tests/system/checkds/ns5/named.conf.j2
index ceb65eea8176c3cd8dc0b48027465c8f57b87bd7..9863036100345109d0e306c1ad80440eb4d7bc25 100644 (file)
--- a/bin/tests/system/checkds/ns5/named.conf.j2
+++ b/bin/tests/system/checkds/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns6/named.conf.j2 b/bin/tests/system/checkds/ns6/named.conf.j2
index 7a1c726b2771f8344638333cd8faa17d251e9345..b84a62c5d53906666b25bfbfd2320624d306ab1a 100644 (file)
--- a/bin/tests/system/checkds/ns6/named.conf.j2
+++ b/bin/tests/system/checkds/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns7/named.conf.j2 b/bin/tests/system/checkds/ns7/named.conf.j2
index ddd5c883d21fa6655745878223be95d403853e41..c322d6651e2575d46b61860c19dd941a1811c888 100644 (file)
--- a/bin/tests/system/checkds/ns7/named.conf.j2
+++ b/bin/tests/system/checkds/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 // NS7
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns8/named.conf.j2 b/bin/tests/system/checkds/ns8/named.conf.j2
index 518dfe584c12fdf40fc85df873af2994bd9b27a0..a1d9b817abbcae34fdf6748954a99e2929e97633 100644 (file)
--- a/bin/tests/system/checkds/ns8/named.conf.j2
+++ b/bin/tests/system/checkds/ns8/named.conf.j2
@@ -1,13 +1,7 @@
 // NS8
 
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/checkds/ns9/named.conf.j2 b/bin/tests/system/checkds/ns9/named.conf.j2
index b42d222434cc5e241b5242bfab900d229a531fa1..9ff1e7c149ce04d999d4c420448f8f1eb1378f7c 100644 (file)
--- a/bin/tests/system/checkds/ns9/named.conf.j2
+++ b/bin/tests/system/checkds/ns9/named.conf.j2
@@ -3,13 +3,7 @@
 include "trusted.conf";
 
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation yes;

diff --git a/bin/tests/system/checknames/ns1/named.conf.j2 b/bin/tests/system/checknames/ns1/named.conf.j2
index 5587e65956a75323bbe45ea676aeb31a9998c620..f944f382de34c13f000455ec287c8ab19e3fb9f4 100644 (file)
--- a/bin/tests/system/checknames/ns1/named.conf.j2
+++ b/bin/tests/system/checknames/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        check-integrity no;

diff --git a/bin/tests/system/checknames/ns2/named.conf.j2 b/bin/tests/system/checknames/ns2/named.conf.j2
index 12762ee166196e5462f90961e26f2acd8ee427eb..898b225a61e1357855785a199712d7af65a1569e 100644 (file)
--- a/bin/tests/system/checknames/ns2/named.conf.j2
+++ b/bin/tests/system/checknames/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        check-names response warn;
 };

diff --git a/bin/tests/system/checknames/ns3/named.conf.j2 b/bin/tests/system/checknames/ns3/named.conf.j2
index 35069dc33ee44d4213121c57e5bb0753eaf31f15..58dc7cfacb18acedf30ffe812b5dfbe1d2fa58d6 100644 (file)
--- a/bin/tests/system/checknames/ns3/named.conf.j2
+++ b/bin/tests/system/checknames/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        check-names response fail;
 };

diff --git a/bin/tests/system/checknames/ns4/named.conf.j2 b/bin/tests/system/checknames/ns4/named.conf.j2
index 3590f8cb2a2defbbcc1cf6655cf0ff8f26110026..760105de70edbcc0f231fe8341588b43e74d4fea 100644 (file)
--- a/bin/tests/system/checknames/ns4/named.conf.j2
+++ b/bin/tests/system/checknames/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
        check-names primary ignore;

diff --git a/bin/tests/system/checknames/ns5/named.conf.j2 b/bin/tests/system/checknames/ns5/named.conf.j2
index 5637b9d13f4aa615e8e48ad2132676508c8cb2f7..5e418852e77f539f4c1070d2d40e90ae67906b18 100644 (file)
--- a/bin/tests/system/checknames/ns5/named.conf.j2
+++ b/bin/tests/system/checknames/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
        check-names master ignore;

diff --git a/bin/tests/system/cipher_suites/ns1/named.conf.j2 b/bin/tests/system/cipher_suites/ns1/named.conf.j2
index 269f6105b96baab4b9ed8e3e77fe4777a4cde2ce..8e92f2a76716c18b8d343e4f58831bb3fa08b8e5 100644 (file)
--- a/bin/tests/system/cipher_suites/ns1/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns1/named.conf.j2
@@ -33,14 +33,8 @@ tls tls-pfs-chacha20 {
 };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on-v6 { none; };
-       listen-on { 10.53.0.1; };
        listen-on tls tls-perfect-forward-secrecy { 10.53.0.1; };
        listen-on port @EXTRAPORT1@ tls tls-pfs-aes128 { 10.53.0.1; };
        listen-on port @EXTRAPORT2@ tls tls-pfs-aes256 { 10.53.0.1; };

diff --git a/bin/tests/system/cipher_suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2
index b41f5d14261019ac4b7f1dff65924c7994d00b14..2cec45e1330bad1771c1839c5696efbe8d98d2e6 100644 (file)
--- a/bin/tests/system/cipher_suites/ns2/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns2/named.conf.j2
@@ -6,15 +6,9 @@ tls local {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
        listen-on tls local { 10.53.0.2; };             // DoT
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/cipher_suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2
index 5b92a91369f356c9c03c6f789b1c9dd8de9e9c7c..cea46eef9be6d5db50755deb164576c18ec03a14 100644 (file)
--- a/bin/tests/system/cipher_suites/ns3/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns3/named.conf.j2
@@ -6,15 +6,9 @@ tls local {
 };
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
        listen-on tls local { 10.53.0.3; };             // DoT
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/cipher_suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2
index a2a4c5deb90851da82c23492544423eafecdabf7..bc31a82a556399072e2634701276198079d610a7 100644 (file)
--- a/bin/tests/system/cipher_suites/ns4/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns4/named.conf.j2
@@ -6,15 +6,9 @@ tls local {
 };
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
        listen-on tls local { 10.53.0.4; };             // DoT
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/cipher_suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2
index 5c48278e7d2104c669908e6781ea3c66a66dd1b9..d798fb1786cfcb2d5db1f835bfa7351b67c98c2d 100644 (file)
--- a/bin/tests/system/cipher_suites/ns5/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns5/named.conf.j2
@@ -6,15 +6,9 @@ tls local {
 };
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
        listen-on tls local { 10.53.0.5; };             // DoT
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/class/ns1/named.conf.j2 b/bin/tests/system/class/ns1/named.conf.j2
index 66ead536c844a8df63373f71d5f78bf7b9e01c4a..a5f5743a94c2f96be96adfbe8a2c4c68cecd0839 100644 (file)
--- a/bin/tests/system/class/ns1/named.conf.j2
+++ b/bin/tests/system/class/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 };
 
 {% 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 12f092de0399612e2d08a897bdf23553568c7104..d5e7a78c5e4f090f95acf14474a0d8b7a6126ccd 100644 (file)
--- a/bin/tests/system/class/ns2/named.conf.j2
+++ b/bin/tests/system/class/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 };
 
 {% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/class/ns3/named.conf.j2 b/bin/tests/system/class/ns3/named.conf.j2
index 5782db2d291c4a7a7181d07375a04c6099c33254..a5f5743a94c2f96be96adfbe8a2c4c68cecd0839 100644 (file)
--- a/bin/tests/system/class/ns3/named.conf.j2
+++ b/bin/tests/system/class/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 };
 
 {% 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 d22b644ce83078df835a593619cebc32e49d68b6..79bdfddf408cb036718a2bb331fcc09f0ac11b55 100644 (file)
--- a/bin/tests/system/configloading/ns1/named.conf.j2
+++ b/bin/tests/system/configloading/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% set wrongoption = wrongoption | default(False) %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/cookie/ns1/named.conf.j2 b/bin/tests/system/cookie/ns1/named.conf.j2
index 23bc6ee3b2e93773633816d52c42f935abc6d337..3f7ff3bc508e0384b620051a38e97c190601c8ff 100644 (file)
--- a/bin/tests/system/cookie/ns1/named.conf.j2
+++ b/bin/tests/system/cookie/ns1/named.conf.j2
@@ -10,13 +10,7 @@ server 10.53.0.10 {
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; }
                 except-from { "example.org"; };

diff --git a/bin/tests/system/cookie/ns2/named.conf.j2 b/bin/tests/system/cookie/ns2/named.conf.j2
index ad9e6a81088fee1492f05ef0c408cad0c04ba1ea..f5c1483f3c574d8893c7bc421d31495663acc75a 100644 (file)
--- a/bin/tests/system/cookie/ns2/named.conf.j2
+++ b/bin/tests/system/cookie/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        send-cookie yes;

diff --git a/bin/tests/system/cookie/ns3/named.conf.j2 b/bin/tests/system/cookie/ns3/named.conf.j2
index f28cc39a73e3f9ccc98e0724f5fd4c44c74ddb46..12a05a28e221041b0cc723904097bb3ce6efd831 100644 (file)
--- a/bin/tests/system/cookie/ns3/named.conf.j2
+++ b/bin/tests/system/cookie/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; }
                 except-from { "example.org"; };

diff --git a/bin/tests/system/cookie/ns4/named.conf.j2 b/bin/tests/system/cookie/ns4/named.conf.j2
index de7897db012a0a996e5df70146286d172e62c6f0..86ef56b942d7a86f62578e33c5da572c357f7aba 100644 (file)
--- a/bin/tests/system/cookie/ns4/named.conf.j2
+++ b/bin/tests/system/cookie/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        cookie-algorithm siphash24;
        cookie-secret "569d36a6cc27d6bf55502183302ba352";

diff --git a/bin/tests/system/cookie/ns5/named.conf.j2 b/bin/tests/system/cookie/ns5/named.conf.j2
index beb84886c27a7692b444b98aac5bbd69140176df..d801451653412f75320297efc2bebc8cee42dd05 100644 (file)
--- a/bin/tests/system/cookie/ns5/named.conf.j2
+++ b/bin/tests/system/cookie/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        cookie-algorithm siphash24;
        cookie-secret "569d36a6cc27d6bf55502183302ba352";

diff --git a/bin/tests/system/cookie/ns6/named.conf.j2 b/bin/tests/system/cookie/ns6/named.conf.j2
index 2e81e57847a288456f4220ce1d4e61de4982695f..686dde98cbf9ad89e753e020500234c3da376e7e 100644 (file)
--- a/bin/tests/system/cookie/ns6/named.conf.j2
+++ b/bin/tests/system/cookie/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        cookie-algorithm siphash24;
        cookie-secret "6b300e27a0db46d4b046e4189790fa7d";

diff --git a/bin/tests/system/cookie/ns7/named.conf.j2 b/bin/tests/system/cookie/ns7/named.conf.j2
index b1769fd78f3239f91cd3a0f328cbcf951193ab4f..d714005f779fee0243ff3172d305922f54312229 100644 (file)
--- a/bin/tests/system/cookie/ns7/named.conf.j2
+++ b/bin/tests/system/cookie/ns7/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        answer-cookie no;
        send-cookie yes;

diff --git a/bin/tests/system/cookie/ns8/named.conf.j2 b/bin/tests/system/cookie/ns8/named.conf.j2
index 9ad6dbe56acf4b94a9bcf49463dcfa5ba92a6892..b431b819075d0938210c6986b0c55ad9527deb71 100644 (file)
--- a/bin/tests/system/cookie/ns8/named.conf.j2
+++ b/bin/tests/system/cookie/ns8/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        rate-limit {};
        require-server-cookie yes;

diff --git a/bin/tests/system/cpu/ns1/named.conf.j2 b/bin/tests/system/cpu/ns1/named.conf.j2
index fb49f95ab49e426341d2399d7a99a7f8ae6d0986..a5f5743a94c2f96be96adfbe8a2c4c68cecd0839 100644 (file)
--- a/bin/tests/system/cpu/ns1/named.conf.j2
+++ b/bin/tests/system/cpu/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       query-source address 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 };
 
 {% include "_common/controls.conf.j2" %}

diff --git a/bin/tests/system/cyclic_glue/ns1/named.conf.j2 b/bin/tests/system/cyclic_glue/ns1/named.conf.j2
index bcc8b544238dd47b6cf83cee124c90f781294973..3f80a4bbf4876c0d094a5d1e2842a231876daa90 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns1/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/cyclic_glue/ns2/named.conf.j2 b/bin/tests/system/cyclic_glue/ns2/named.conf.j2
index 351c53a7be195bf788afd07c67832aff42cd03f3..5eddc682d0bb3f510ca07ab71c4a2b2dcce57ad1 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns2/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-responses no;

diff --git a/bin/tests/system/cyclic_glue/ns3/named.conf.j2 b/bin/tests/system/cyclic_glue/ns3/named.conf.j2
index d8dbea2829994f09954a7979b5bc463bed80fb20..984eae0086c73de052d678ffd00ce6777e4b4a67 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns3/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 b/bin/tests/system/cyclic_glue/ns4/named.conf.j2
index ea8cb38ee497c6c94b4bd37b63aafdf754aa6768..cb949796d335d7092e973cf94b983575f757f9c3 100644 (file)
--- a/bin/tests/system/cyclic_glue/ns4/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/database/ns1/named.conf.j2 b/bin/tests/system/database/ns1/named.conf.j2
index 0da97250d65b00363eafbd94a3309debb3916036..9eb0406c830382ed47c91a16e9f7227e02572311 100644 (file)
--- a/bin/tests/system/database/ns1/named.conf.j2
+++ b/bin/tests/system/database/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/delegation_ttl/ns1/named.conf.j2 b/bin/tests/system/delegation_ttl/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/delegation_ttl/ns1/named.conf.j2
+++ b/bin/tests/system/delegation_ttl/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/delegation_ttl/ns2/named.conf.j2 b/bin/tests/system/delegation_ttl/ns2/named.conf.j2
index e80bbda1c677ee2853f02b5ec9612481d7ce8e1b..40a4dab05dde2182d7dc2efb96edff2e5ef6a77f 100644 (file)
--- a/bin/tests/system/delegation_ttl/ns2/named.conf.j2
+++ b/bin/tests/system/delegation_ttl/ns2/named.conf.j2
@@ -2,13 +2,7 @@
 {% set maxttl = maxttl | default(None) %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 {% if minttl != None %}
        min-delegation-ttl @minttl@;

diff --git a/bin/tests/system/delegdb_flush/ns1/named.conf.j2 b/bin/tests/system/delegdb_flush/ns1/named.conf.j2
index 0e2f8eeac65f2246aadbb0fc236272d3464f149a..b2ebb584016ded08012bebc37e3447d71aeec442 100644 (file)
--- a/bin/tests/system/delegdb_flush/ns1/named.conf.j2
+++ b/bin/tests/system/delegdb_flush/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        max-cache-size 8000;
 };
 

diff --git a/bin/tests/system/dns64/ns1/named.conf.j2 b/bin/tests/system/dns64/ns1/named.conf.j2
index 67b8047b057ac4afbfb65dff84bb720680223e20..1078fa8864df763b7579aebfcada31a9b9d602c1 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf.j2
+++ b/bin/tests/system/dns64/ns1/named.conf.j2
@@ -5,13 +5,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { 10.53.0.1; };
        dnssec-validation no;
 

diff --git a/bin/tests/system/dns64/ns1/named2.conf.j2 b/bin/tests/system/dns64/ns1/named2.conf.j2
index 9199422234b2ee8d54778011b685ecd0619e496f..2009ae965cfd9a8a7e6bdc0846d703ae0119cc35 100644 (file)
--- a/bin/tests/system/dns64/ns1/named2.conf.j2
+++ b/bin/tests/system/dns64/ns1/named2.conf.j2
@@ -5,13 +5,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { 10.53.0.1; };
        dnssec-validation no;
 

diff --git a/bin/tests/system/dns64/ns1/named3.conf.j2 b/bin/tests/system/dns64/ns1/named3.conf.j2
index 77b9ed04035e251162fbacf4ca0f905c6fd96370..aab22dcd94d3f676f6c72b592c85fa7d13a654e4 100644 (file)
--- a/bin/tests/system/dns64/ns1/named3.conf.j2
+++ b/bin/tests/system/dns64/ns1/named3.conf.j2
@@ -5,13 +5,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { 10.53.0.1; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2
index e93c480af9a39114ff27102145d1db98abb6d80a..54fe2e8fa1c84c8eef0b48a5744d199580e5255d 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.j2
+++ b/bin/tests/system/dns64/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 
        dns64 2001:aaaa::/96 {

diff --git a/bin/tests/system/dns64_dname/ns1/named.conf.j2 b/bin/tests/system/dns64_dname/ns1/named.conf.j2
index c56dac5e1e418831e698a98ac041ac03aa73d07e..5eea52408bc6702be46ab3dc8b51379b3f007796 100644 (file)
--- a/bin/tests/system/dns64_dname/ns1/named.conf.j2
+++ b/bin/tests/system/dns64_dname/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       query-source address 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/dns64_dname/ns2/named.conf.j2 b/bin/tests/system/dns64_dname/ns2/named.conf.j2
index 6939e53d7d98f61937b303499ce50e26f06a99eb..4dad8ccc61105f7b962361bf142490d9549647de 100644 (file)
--- a/bin/tests/system/dns64_dname/ns2/named.conf.j2
+++ b/bin/tests/system/dns64_dname/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       query-source address 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { any; };
        dnssec-validation no;
        qname-minimization off;

diff --git a/bin/tests/system/dnssec/ns1/named.conf.j2 b/bin/tests/system/dnssec/ns1/named.conf.j2
index cd8c180962f4537b26fe9e3a876ed3ec402a7dcd..af73a03e74c92a633a7499993d1a21a2c4255085 100644 (file)
--- a/bin/tests/system/dnssec/ns1/named.conf.j2
+++ b/bin/tests/system/dnssec/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        minimal-any no;
        minimal-responses no;
        recursion no;

diff --git a/bin/tests/system/dnssec/ns2/named.conf.j2 b/bin/tests/system/dnssec/ns2/named.conf.j2
index db989e269829087bbfcd055b55e0e1bb71309159..8d7a1bafea5c0d6ceb1b8d3ab229b7e17d615939 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        minimal-any no;
        minimal-responses no;

diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2
index 18420416c48343e12d823c7a068824bc9ead6bb3..2fe1c4bac2e5d871e199afa47650b5baef500ef6 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 {% set long_sigs = long_sigs  | default(False) %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        minimal-any no;
        minimal-responses yes;

diff --git a/bin/tests/system/dnssec/ns4/named.conf.j2 b/bin/tests/system/dnssec/ns4/named.conf.j2
index da418cd0b03db1a13e9d36374b2b10ca802a7602..511d82f84eaa165ebddf6715920ff13d1292e937 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named.conf.j2
+++ b/bin/tests/system/dnssec/ns4/named.conf.j2
@@ -6,13 +6,7 @@
 {% set multi_view = multi_view | default(False) %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        minimal-any no;
        minimal-responses no;
 

diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2
index 1622479efb9fb946e4222f17ae280a188926071c..9f5ecbb4b489814737611c2c0038ebe2cc730833 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf.j2
+++ b/bin/tests/system/dnssec/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        minimal-any no;
        disable-algorithms . { @ALTERNATIVE_ALGORITHM@; };
        dnssec-validation yes;

diff --git a/bin/tests/system/dnssec/ns9/named.conf.j2 b/bin/tests/system/dnssec/ns9/named.conf.j2
index 32b2c430189d5a546527ab89b47ec6cc97a1533e..045676c73057715d7087ce0fb741ec37fffa59b5 100644 (file)
--- a/bin/tests/system/dnssec/ns9/named.conf.j2
+++ b/bin/tests/system/dnssec/ns9/named.conf.j2
@@ -3,13 +3,7 @@
 {% set forward_badkey = forward_badkey | default(False) %}
 
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        minimal-any no;
        dnssec-validation yes;
        forward only;

diff --git a/bin/tests/system/dnssec_bypass/ns1/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns1/named.conf.j2
index 95ed126990dd13c1139b6db272210b71c7257124..f50c5f2f472089885abe1a672989e614f8c2fdd1 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns1/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns1/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/dnssec_bypass/ns2/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns2/named.conf.j2
index a67cce0329a0d1d4210c9d3bd0f4d80bdeb4e658..28c87bda1d14e4e402f555a84c5b827abad9b4bd 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns2/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/dnssec_bypass/ns3/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns3/named.conf.j2
index db706fd3fd16030334a8f2945940b9969eddbac7..4f721e2636ab14f96959c94d2813f8bbcfaeff13 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns3/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
index 83e737e2fe3974703d5191dcc299825a707453b8..385e6a5f61446d8e6426cb882e3621be5b838c4d 100644 (file)
--- a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation yes;
        synth-from-dnssec yes;

diff --git a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2 b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2
index dde039ac2380557971cf39e4231807105baf66ff..13c820e34e4ef5446308531928829bc91dbfe6a6 100644 (file)
--- a/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec_cname_response/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
index adb07d812f5ff2ea6523c689ac4952c7ecdbd440..88d3c7fc94663f92d62d34e7d9e75180d3d01658 100644 (file)
--- a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        minimal-responses no;
        qname-minimization off;

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 03420a880136b9e74c2af8040a294a734cc9924b..b23c4296f14bc5598977d8f09545785d0103c74b 100644 (file)
--- a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        trust-anchor-telemetry no;
        resolver-query-timeout 5000;

diff --git a/bin/tests/system/dnssec_py/ns1/named.conf.j2 b/bin/tests/system/dnssec_py/ns1/named.conf.j2
index e33e2f5bdb7db1d7380e3463102fc4e2c668bd6a..edbf784d75658755c1ced7903a5fb48da99793a0 100644 (file)
--- a/bin/tests/system/dnssec_py/ns1/named.conf.j2
+++ b/bin/tests/system/dnssec_py/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address @ns.ip@;
-       notify-source @ns.ip@;
-       transfer-source @ns.ip@;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { @ns.ip@; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 
        key-directory "keys";
 

diff --git a/bin/tests/system/dnssec_py/ns2/named.conf.j2 b/bin/tests/system/dnssec_py/ns2/named.conf.j2
index ccc1b3a304143b534959ba938ddc85d269e746e1..b2e59558eb21f4e4f3a8e15198d2911c820a3f8a 100644 (file)
--- a/bin/tests/system/dnssec_py/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_py/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address @ns.ip@;
-       notify-source @ns.ip@;
-       transfer-source @ns.ip@;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { @ns.ip@; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 
        key-directory "keys";
 

diff --git a/bin/tests/system/dnssec_py/ns3/named.conf.j2 b/bin/tests/system/dnssec_py/ns3/named.conf.j2
index df796cfd12cf1188160b1430e24607d9fbe63401..5fa2909197eae1ba054f99a899db7a39413fa836 100644 (file)
--- a/bin/tests/system/dnssec_py/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec_py/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address @ns.ip@;
-       notify-source @ns.ip@;
-       transfer-source @ns.ip@;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { @ns.ip@; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 
        key-directory "keys";
 

diff --git a/bin/tests/system/dnssec_py/ns9/named.conf.j2 b/bin/tests/system/dnssec_py/ns9/named.conf.j2
index 5ceaee01d063a9925fdd3ee213348ec793d938b1..8e2145a0c4ce48adedc7bb5eaed4b9e66772f5ca 100644 (file)
--- a/bin/tests/system/dnssec_py/ns9/named.conf.j2
+++ b/bin/tests/system/dnssec_py/ns9/named.conf.j2
@@ -3,13 +3,7 @@
 {% set max_validations_per_fetch = max_validations_per_fetch | default(16) %}
 
 options {
-       query-source address @ns.ip@;
-       notify-source @ns.ip@;
-       transfer-source @ns.ip@;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { @ns.ip@; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
 
 
        dnssec-validation yes;

diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
index f0d908eb5b910746f08050464c871e3a859ca68c..78760e5b427412a3d7f90d416040f1df4459aeb5 100644 (file)
--- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        minimal-responses no;
 };

diff --git a/bin/tests/system/dnstap/ns1/named.conf.j2 b/bin/tests/system/dnstap/ns1/named.conf.j2
index 7473b63c4ac24159c04cde771f28b51c099aa650..e4ad75b0f8898e4b20671e77925421926df2d570 100644 (file)
--- a/bin/tests/system/dnstap/ns1/named.conf.j2
+++ b/bin/tests/system/dnstap/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        statistics-file "named.stats";
        dnstap-identity "ns1";

diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2
index a4a7e47cf28333134ccb62435d8f8e5340140200..d4f9c160bec6a1c07451c48be9484a72e76faf6a 100644 (file)
--- a/bin/tests/system/dnstap/ns2/named.conf.j2
+++ b/bin/tests/system/dnstap/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        dnstap-identity "ns2";
        dnstap-version "xxx";

diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2
index 1c5d0f68ece7db02795babb794a3c9a3932ed232..ffd76d231e78e12051366d66a95c1956e73acab7 100644 (file)
--- a/bin/tests/system/dnstap/ns3/named.conf.j2
+++ b/bin/tests/system/dnstap/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnstap-identity "ns3";
        dnstap-version "xxx";
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2
index 4526cf6341466ab5d7ff9dcee75edb58f797c2da..1ad087cc59c8ac2f2a710be92603c5b97e1fd2de 100644 (file)
--- a/bin/tests/system/dnstap/ns4/named.conf.j2
+++ b/bin/tests/system/dnstap/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnstap-identity "ns4";
        dnstap-version "xxx";
        dnstap-output unix "dnstap.out";

diff --git a/bin/tests/system/dnstap/ns5/named.conf.j2 b/bin/tests/system/dnstap/ns5/named.conf.j2
index 6d94640eae267f53e73057e5fa600f7f253a2dcd..c7658c2ff012f40d44ff8baf740ffa980a66659c 100644 (file)
--- a/bin/tests/system/dnstap/ns5/named.conf.j2
+++ b/bin/tests/system/dnstap/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnstap-identity "ns5";
        dnstap-version "xxx";
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/doth/ns1/named.conf.j2 b/bin/tests/system/doth/ns1/named.conf.j2
index a1be088691a09ff964895f7adee0ea4e47464438..cf2672bc7b4af446b737384c240b7e42a5835c12 100644 (file)
--- a/bin/tests/system/doth/ns1/named.conf.j2
+++ b/bin/tests/system/doth/ns1/named.conf.j2
@@ -52,22 +52,16 @@ tls tls-forward-secrecy-mutual-tls {
 };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
        https-port @HTTPSPORT@;
        http-port @HTTPPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
        listen-on tls tls-forward-secrecy { 10.53.0.1; };             // DoT
        listen-on-v6 tls tls-forward-secrecy { fd92:7065:b8e:ffff::1;};
        listen-on tls ephemeral http local { 10.53.0.1; };  // DoH
        listen-on-v6 tls ephemeral http local { fd92:7065:b8e:ffff::1; };
        listen-on tls none http local { 10.53.0.1; };       // unencrypted DoH
        listen-on-v6 tls none http local { fd92:7065:b8e:ffff::1; };
-       listen-on-v6 { none; };
        listen-on port @EXTRAPORT1@ tls tls-pfs-aes256 { 10.53.0.1; };             // DoT
        listen-on-v6 port @EXTRAPORT1@ tls tls-pfs-aes256 { fd92:7065:b8e:ffff::1;};
        listen-on port @EXTRAPORT2@ tls tls-no-subject-alt-name { 10.53.0.1; };             // DoT

diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2
index 999897d94b535f80ef28e6632953743a01028720..f074665dda6de1c683a77104daae34d6af323499 100644 (file)
--- a/bin/tests/system/doth/ns2/named.conf.j2
+++ b/bin/tests/system/doth/ns2/named.conf.j2
@@ -11,22 +11,16 @@ http local {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
        https-port @HTTPSPORT@;
        http-port @HTTPPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
        listen-on tls local { 10.53.0.2; };             // DoT
        listen-on-v6 tls local { fd92:7065:b8e:ffff::2; };
        listen-on tls local http local { 10.53.0.2; };  // DoH
        listen-on-v6 tls local http local { fd92:7065:b8e:ffff::2; };
        listen-on tls none http local { 10.53.0.2; };   // unencrypted DoH
        listen-on-v6 tls none http local { fd92:7065:b8e:ffff::2; };
-       listen-on-v6 { none; };
        allow-recursion { any; };
        allow-query-cache { any; };
        allow-recursion-on { 10.53.0.2; }; # allow-query-cache-on inherits;

diff --git a/bin/tests/system/doth/ns3/named.conf.j2 b/bin/tests/system/doth/ns3/named.conf.j2
index df5a5eabd4a3644862be2377eaee13dd3bf4c864..c1dc279363e633fbc309e62d8529d4ab9332418e 100644 (file)
--- a/bin/tests/system/doth/ns3/named.conf.j2
+++ b/bin/tests/system/doth/ns3/named.conf.j2
@@ -11,17 +11,11 @@ http local {
 };
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
        https-port @HTTPSPORT@;
        http-port @HTTPPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
        listen-on tls local { 10.53.0.3; };             // DoT
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/doth/ns4/named.conf.j2 b/bin/tests/system/doth/ns4/named.conf.j2
index ccc282a288bd05ad18f3ee96247c016ea415325e..b1b5d456321e61fb57ba7f233e6c00f7d92fab24 100644 (file)
--- a/bin/tests/system/doth/ns4/named.conf.j2
+++ b/bin/tests/system/doth/ns4/named.conf.j2
@@ -18,18 +18,12 @@ http local {
 };
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
        https-port @HTTPSPORT@;
        http-port @HTTPPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
        listen-on tls local { 10.53.0.4; };             // DoT
        listen-on tls local http local { 10.53.0.4; };  // DoH
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/doth/ns5/named.conf.j2 b/bin/tests/system/doth/ns5/named.conf.j2
index b01983f89e8818d144bac7b32b69405b891c1c9e..d7a094e711a410f7c75b3675f7b39a8c75d1bfec 100644 (file)
--- a/bin/tests/system/doth/ns5/named.conf.j2
+++ b/bin/tests/system/doth/ns5/named.conf.j2
@@ -8,16 +8,10 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
        https-port @HTTPSPORT@;
        http-port @HTTPPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
        recursion no;
        notify no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/dsdigest/ns1/named.conf.j2 b/bin/tests/system/dsdigest/ns1/named.conf.j2
index f283359d738df57b0c6a39b1387a4972a22af9f4..11f0f0333f03be6a519ff166e8019246a235b05a 100644 (file)
--- a/bin/tests/system/dsdigest/ns1/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/dsdigest/ns2/named.conf.j2 b/bin/tests/system/dsdigest/ns2/named.conf.j2
index 72d4939f1759a205dee85799819d02c935f587db..783d651a8f717020b98549d158ed4f5266c01a2f 100644 (file)
--- a/bin/tests/system/dsdigest/ns2/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/dsdigest/ns3/named.conf.j2 b/bin/tests/system/dsdigest/ns3/named.conf.j2
index 22102ae93dceed14b359c10c593adccf1edc2554..6c403bb431a0ce8948f3836fd1ea4c7f2e84adb9 100644 (file)
--- a/bin/tests/system/dsdigest/ns3/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        /* only SHA-256 is enabled */
        disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; };

diff --git a/bin/tests/system/dsdigest/ns4/named.conf.j2 b/bin/tests/system/dsdigest/ns4/named.conf.j2
index d9bd797d7efbd3f89616f9717535ce922b7a6e34..ba8ca55dad41ee7206070db67920cfa6c382936c 100644 (file)
--- a/bin/tests/system/dsdigest/ns4/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns4/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        /* only SHA-256 is enabled */
        disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; };

diff --git a/bin/tests/system/ecdsa/ns1/named.conf.j2 b/bin/tests/system/ecdsa/ns1/named.conf.j2
index f283359d738df57b0c6a39b1387a4972a22af9f4..11f0f0333f03be6a519ff166e8019246a235b05a 100644 (file)
--- a/bin/tests/system/ecdsa/ns1/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/ecdsa/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2
index 761aa900db860959f85ec70c6d851020b8502fbc..8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed 100644 (file)
--- a/bin/tests/system/ecdsa/ns2/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/ecdsa/ns3/named.conf.j2 b/bin/tests/system/ecdsa/ns3/named.conf.j2
index 403eb4aac4d30a5864bb91df7dc8a701d4856928..8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed 100644 (file)
--- a/bin/tests/system/ecdsa/ns3/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/eddsa/ns1/named.conf.j2 b/bin/tests/system/eddsa/ns1/named.conf.j2
index f283359d738df57b0c6a39b1387a4972a22af9f4..11f0f0333f03be6a519ff166e8019246a235b05a 100644 (file)
--- a/bin/tests/system/eddsa/ns1/named.conf.j2
+++ b/bin/tests/system/eddsa/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/eddsa/ns2/named.conf.j2 b/bin/tests/system/eddsa/ns2/named.conf.j2
index 761aa900db860959f85ec70c6d851020b8502fbc..8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed 100644 (file)
--- a/bin/tests/system/eddsa/ns2/named.conf.j2
+++ b/bin/tests/system/eddsa/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/eddsa/ns3/named.conf.j2 b/bin/tests/system/eddsa/ns3/named.conf.j2
index 403eb4aac4d30a5864bb91df7dc8a701d4856928..8bc2a669ea51a2a00f1dcb5ac4f67210f78243ed 100644 (file)
--- a/bin/tests/system/eddsa/ns3/named.conf.j2
+++ b/bin/tests/system/eddsa/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/ede24/ns1/named.conf.j2 b/bin/tests/system/ede24/ns1/named.conf.j2
index 5f07e5b810f116ea2afc6f0729775a5ed61ed19e..979cdbf5337c4945b65c459646b98753f49ee4b0 100644 (file)
--- a/bin/tests/system/ede24/ns1/named.conf.j2
+++ b/bin/tests/system/ede24/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       port @PORT@;
-       query-source address 10.53.0.1;
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
-       transfer-source 10.53.0.1;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        also-notify { 10.53.0.2 port @PORT@; };
-       notify-source 10.53.0.1;
 };
 
 zone "foo.fr" {

diff --git a/bin/tests/system/ede24/ns2/named.conf.j2 b/bin/tests/system/ede24/ns2/named.conf.j2
index 27e3b71296f60c9ec8830ebdc052a1d4b59cf685..6650d31f8642baeb842ab8c04b84435d611795f2 100644 (file)
--- a/bin/tests/system/ede24/ns2/named.conf.j2
+++ b/bin/tests/system/ede24/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       port @PORT@;
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       transfer-source 10.53.0.2;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.j2 b/bin/tests/system/ednscompliance/ns1/named.conf.j2
index 1c10d0fce2c058890e6d5ae15344b3155014d663..ffe83e7741fe520f60a2fafcaa1850f63a77c744 100644 (file)
--- a/bin/tests/system/ednscompliance/ns1/named.conf.j2
+++ b/bin/tests/system/ednscompliance/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        server-id "ns1";

diff --git a/bin/tests/system/emptyzones/ns1/named.conf.j2 b/bin/tests/system/emptyzones/ns1/named.conf.j2
index 3c358ddc7f63b0e717bac0f626daf87d40887709..0fc5fff6351eef2ba360b1dae128b3dcc1726b17 100644 (file)
--- a/bin/tests/system/emptyzones/ns1/named.conf.j2
+++ b/bin/tests/system/emptyzones/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; }
                 except-from { "example.org"; };

diff --git a/bin/tests/system/enginepkcs11/ns1/named.conf.j2 b/bin/tests/system/enginepkcs11/ns1/named.conf.j2
index f3c1180cd4bd3a196890508cd8c9aae2b76c4624..df534720e444d9dbb350e3449f4ffef69037b8a3 100644 (file)
--- a/bin/tests/system/enginepkcs11/ns1/named.conf.j2
+++ b/bin/tests/system/enginepkcs11/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 b/bin/tests/system/enginepkcs11/ns2/named.conf.j2
index 8e46b4b7924ef69dc735df4406cda9dd9d5588d7..672812d87d0b7522a5e619c91494c8bcebce9544 100644 (file)
--- a/bin/tests/system/enginepkcs11/ns2/named.conf.j2
+++ b/bin/tests/system/enginepkcs11/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/expiredglue/ns1/named.conf.j2 b/bin/tests/system/expiredglue/ns1/named.conf.j2
index 42dba75f8691263658b240469e521b1dc5da9e0c..e67326a1a75ff3a5e80c36c11daec5c13e751b85 100644 (file)
--- a/bin/tests/system/expiredglue/ns1/named.conf.j2
+++ b/bin/tests/system/expiredglue/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/expiredglue/ns2/named.conf.j2 b/bin/tests/system/expiredglue/ns2/named.conf.j2
index d0b75bf8657a61a9e13d493dd0219fa3ce0dfa7d..1b47dbf9bdd9b930c1c9b2b44a061bcaec1a1b78 100644 (file)
--- a/bin/tests/system/expiredglue/ns2/named.conf.j2
+++ b/bin/tests/system/expiredglue/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/expiredglue/ns3/named.conf.j2 b/bin/tests/system/expiredglue/ns3/named.conf.j2
index f83df484965e5379facfe200cde1f9a1bbde13c3..bb1a28329ecf72e8c4a11c8bf0e2c20cf793af90 100644 (file)
--- a/bin/tests/system/expiredglue/ns3/named.conf.j2
+++ b/bin/tests/system/expiredglue/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/expiredglue/ns4/named.conf.j2 b/bin/tests/system/expiredglue/ns4/named.conf.j2
index ba3847fca1d152cb65c7a905389ce3355651295f..3b2e2068ab84a74d0a31c74bd0fda5fef3d6bbb6 100644 (file)
--- a/bin/tests/system/expiredglue/ns4/named.conf.j2
+++ b/bin/tests/system/expiredglue/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.j2 b/bin/tests/system/fetchlimit/ns1/named.conf.j2
index d1b6dd858246bfbbbf746378f094dfdaa55c0141..948df0084758f52b83cc5e377bd0b8cf9128ee72 100644 (file)
--- a/bin/tests/system/fetchlimit/ns1/named.conf.j2
+++ b/bin/tests/system/fetchlimit/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.j2 b/bin/tests/system/fetchlimit/ns2/named.conf.j2
index 6f5e7da2963ab92c2fa27e6c533e9b0c1311bded..b3fcb60f94a9f7176e87273538be428f96db7a82 100644 (file)
--- a/bin/tests/system/fetchlimit/ns2/named.conf.j2
+++ b/bin/tests/system/fetchlimit/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2
index 36dc9af744938c40f4a7ee1ab5640d7cf19d85d1..faa0d733f8e28ac4b39ad30fcf261c115ab7341c 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named.conf.j2
+++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        fetches-per-server 400;
 };

diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 b/bin/tests/system/fetchlimit/ns3/named2.conf.j2
index a81b834b3d0bad9fb31d732f1f9f4a5cb884e7ec..64f08b0e6de6f83a20437144cb9604409f4d53fc 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2
+++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        fetches-per-zone 40;
 };

diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 b/bin/tests/system/fetchlimit/ns3/named3.conf.j2
index 76e87e31c7fb1afa33c102aee0604d9fd6e59ad2..e269fe3e4e8ea32d38d5f65e060d67ee7d3fa340 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2
+++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursive-clients 400;
 };

diff --git a/bin/tests/system/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2
index dab43bdf2a69662e1f711d7450b45c5a1387d26c..02be4a306539c68fae895732d5812580922852c6 100644 (file)
--- a/bin/tests/system/fetchlimit/ns5/named.conf.j2
+++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        clients-per-query 5;
        max-clients-per-query 10;

diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 b/bin/tests/system/fetchlimit/ns5/named2.conf.j2
index 8127018695cdd10626ce0ba0ed48347c04eb3e13..146746addd5afc665b583660b7f4809a20aa7f43 100644 (file)
--- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2
+++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2
index 855befe3f96253b960749835a15f8a5484a4a68f..4c524681cf68f2b7005a3cf3ad3a7000f5dea02c 100644 (file)
--- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2
+++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/formerr/ns1/named.conf.j2 b/bin/tests/system/formerr/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/formerr/ns1/named.conf.j2
+++ b/bin/tests/system/formerr/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/forward/ns10/named.conf.j2 b/bin/tests/system/forward/ns10/named.conf.j2
index 815d92305a1d878210d0f4053a94e67ccb9fcfb8..2a2a444c12781166d61c0bee4803366e11f9bc20 100644 (file)
--- a/bin/tests/system/forward/ns10/named.conf.j2
+++ b/bin/tests/system/forward/ns10/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.10; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        minimal-responses no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/forward/ns4/named.conf.j2 b/bin/tests/system/forward/ns4/named.conf.j2
index a333a15772b57f174ca70f70ea4c8b2cbb58690e..071e4187fef61f05c4fb003f04487d68e662008b 100644 (file)
--- a/bin/tests/system/forward/ns4/named.conf.j2
+++ b/bin/tests/system/forward/ns4/named.conf.j2
@@ -3,13 +3,7 @@ include "named-tls.conf";
 {% endif %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        minimal-responses yes;
 

diff --git a/bin/tests/system/forward/ns5/named.conf.j2 b/bin/tests/system/forward/ns5/named.conf.j2
index bf7ce3cb528e8f2c826906ad94ee57891a3ea6ed..f93ddceaf034327303f7d10e459699cde65bca90 100644 (file)
--- a/bin/tests/system/forward/ns5/named.conf.j2
+++ b/bin/tests/system/forward/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        forward only;
        forwarders { 10.53.0.4; };
        deny-answer-aliases { "rebind"; };

diff --git a/bin/tests/system/forward/ns7/named.conf.j2 b/bin/tests/system/forward/ns7/named.conf.j2
index fc392c37d4ff674edfb3ea52773cfb3f6f09a658..40e4b2463f066a24047ac2dc0fd0d4a38f27347d 100644 (file)
--- a/bin/tests/system/forward/ns7/named.conf.j2
+++ b/bin/tests/system/forward/ns7/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        forwarders { 10.53.0.4; };
        forward first;
        dnssec-validation no;

diff --git a/bin/tests/system/forward/ns8/named.conf.j2 b/bin/tests/system/forward/ns8/named.conf.j2
index 0d44e5f900a23eed7fa2cdcd3e0170db25f0a887..1d7a266ff4ab395eaa2da179a79b9d2a693724db 100644 (file)
--- a/bin/tests/system/forward/ns8/named.conf.j2
+++ b/bin/tests/system/forward/ns8/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        forwarders { 10.53.0.2; };      // returns referrals
        forward first;
        dnssec-validation no;

diff --git a/bin/tests/system/forward/ns9/named.conf.j2 b/bin/tests/system/forward/ns9/named.conf.j2
index f481a351e5cb6f4fdceac279ee205b30f9c9e085..a49d8d42874c8aab19bcb1e9bcbc606a37a62cdc 100644 (file)
--- a/bin/tests/system/forward/ns9/named.conf.j2
+++ b/bin/tests/system/forward/ns9/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        edns-udp-size 1232;
 };

diff --git a/bin/tests/system/forward/ns9/named2.conf.j2 b/bin/tests/system/forward/ns9/named2.conf.j2
index 2649ddc11d13d336aa7a9d2d36aa65f23958ca88..673a27789211cad93d03790e401ec6199072bf4a 100644 (file)
--- a/bin/tests/system/forward/ns9/named2.conf.j2
+++ b/bin/tests/system/forward/ns9/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        edns-udp-size 1232;
 };

diff --git a/bin/tests/system/forward/ns9/named3.conf.j2 b/bin/tests/system/forward/ns9/named3.conf.j2
index cd91ad737b457c5b4e67951d66bcc2aa40a9673b..6186195d74394175bbc0fa453302517c4f93249b 100644 (file)
--- a/bin/tests/system/forward/ns9/named3.conf.j2
+++ b/bin/tests/system/forward/ns9/named3.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        edns-udp-size 1232;
        forward only;

diff --git a/bin/tests/system/forward/ns9/named4.conf.j2 b/bin/tests/system/forward/ns9/named4.conf.j2
index a5c5ccaccdddf94a57653581344c1f8b121e03fa..5c5b6606aa2bb0a68351b9c347f9195997a0322c 100644 (file)
--- a/bin/tests/system/forward/ns9/named4.conf.j2
+++ b/bin/tests/system/forward/ns9/named4.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        edns-udp-size 1232;
 };

diff --git a/bin/tests/system/fwdfirst/ns4/named.conf.j2 b/bin/tests/system/fwdfirst/ns4/named.conf.j2
index 930b9332e0c773ff0a95f9ee2304d3b0db19c085..59881ddbd60aa44b490e416e0a929767521c9118 100644 (file)
--- a/bin/tests/system/fwdfirst/ns4/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        allow-recursion { any; };
        dnssec-validation no;

diff --git a/bin/tests/system/fwdfirst/ns5/named.conf.j2 b/bin/tests/system/fwdfirst/ns5/named.conf.j2
index 50f5057e22ad6bd3cc3c32b41b2ceac3c6f82c7f..4b7f2689c1601bc7c1e614ebf0c4bf1e600b7e76 100644 (file)
--- a/bin/tests/system/fwdfirst/ns5/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        allow-recursion { any; };
        dnssec-validation no;

diff --git a/bin/tests/system/glue/ns1/named.conf.j2 b/bin/tests/system/glue/ns1/named.conf.j2
index e20991b82addf64eb31c829a96f8cf37b5bd0fa4..d4c11772a20b55856f0b17e8974e24f8018e268c 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf.j2
+++ b/bin/tests/system/glue/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/gluecache/ns1/named.conf.j2 b/bin/tests/system/gluecache/ns1/named.conf.j2
index 0925df31b6eb4b5db0e443b62c8f6328d78d3651..40d1168cf571208135a17ff67b979a6b38f79e05 100644 (file)
--- a/bin/tests/system/gluecache/ns1/named.conf.j2
+++ b/bin/tests/system/gluecache/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation no;

diff --git a/bin/tests/system/hooks/ns1/named.conf.j2 b/bin/tests/system/hooks/ns1/named.conf.j2
index 52328b14ce33d0a07f1bb5435e35a5b26f72b47d..2a36f279ab285def446e37259d7fe5a48f8f50bb 100644 (file)
--- a/bin/tests/system/hooks/ns1/named.conf.j2
+++ b/bin/tests/system/hooks/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% set noextension = noextension | default(False) %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-responses no;

diff --git a/bin/tests/system/hooks/ns2/named.conf.j2 b/bin/tests/system/hooks/ns2/named.conf.j2
index c93eb28332805f6b522e5cf908fc842861c820dd..53fc0e51a80a34641a18adcd3725a6bb64c46f8f 100644 (file)
--- a/bin/tests/system/hooks/ns2/named.conf.j2
+++ b/bin/tests/system/hooks/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
        minimal-responses no;

diff --git a/bin/tests/system/host/ns1/named.conf.j2 b/bin/tests/system/host/ns1/named.conf.j2
index 3a5a0a027525f78f75fae1aeddefc9c31fd3f272..3f6dbb2be386a0f4c457f2249b96abd1d44524ef 100644 (file)
--- a/bin/tests/system/host/ns1/named.conf.j2
+++ b/bin/tests/system/host/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/include_multiplecfg/ns2/named.conf.j2 b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2
index 4de2cfcd95a6896d33e31692b16b300618fad67f..87adc58a133693905233b45ac3792faadc55ee10 100644 (file)
--- a/bin/tests/system/include_multiplecfg/ns2/named.conf.j2
+++ b/bin/tests/system/include_multiplecfg/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation no;

diff --git a/bin/tests/system/inline/ns1/named.conf.j2 b/bin/tests/system/inline/ns1/named.conf.j2
index 5fd586624b6b10166d79600c5df8d49fd1a03de8..aa07b3bcf394f11736380c88c0e7fa742ff0adf6 100644 (file)
--- a/bin/tests/system/inline/ns1/named.conf.j2
+++ b/bin/tests/system/inline/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation yes;

diff --git a/bin/tests/system/inline/ns2/named.conf.j2 b/bin/tests/system/inline/ns2/named.conf.j2
index 97189bae0399680d9020d78cf20997eb6b8a4744..df67432e5400ee7fe098b296a83f74fa2ed3f316 100644 (file)
--- a/bin/tests/system/inline/ns2/named.conf.j2
+++ b/bin/tests/system/inline/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        notify-delay 0;

diff --git a/bin/tests/system/inline/ns3/named.conf.j2 b/bin/tests/system/inline/ns3/named.conf.j2
index 0e4e1836373ad1c5bc709e377748c6575406c341..5828f5baa75472a18c2f86f33b665e881baf7a66 100644 (file)
--- a/bin/tests/system/inline/ns3/named.conf.j2
+++ b/bin/tests/system/inline/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        allow-transfer { any; };
        try-tcp-refresh no;

diff --git a/bin/tests/system/inline/ns4/named.conf.j2 b/bin/tests/system/inline/ns4/named.conf.j2
index 3aac0658899857b5b6e026a47c16cd6c73132a1e..abd5972016e49922771f8808b75d8ff7276d3af8 100644 (file)
--- a/bin/tests/system/inline/ns4/named.conf.j2
+++ b/bin/tests/system/inline/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        notify-delay 0;

diff --git a/bin/tests/system/inline/ns5/named.conf.j2 b/bin/tests/system/inline/ns5/named.conf.j2
index 71b05a4d457a6d7c99c6a305a171de1e0327b288..536ca3867a32f0373a1899ff486bfbd3374f2c68 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.j2
+++ b/bin/tests/system/inline/ns5/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
        notify-delay 0;

diff --git a/bin/tests/system/inline/ns5/named2.conf.j2 b/bin/tests/system/inline/ns5/named2.conf.j2
index 8283a54c1de3c3f17d12673afc307231c30865dd..b42934f7ad55c92b87de2f8b2ba057e2896114e9 100644 (file)
--- a/bin/tests/system/inline/ns5/named2.conf.j2
+++ b/bin/tests/system/inline/ns5/named2.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
        notify-delay 0;

diff --git a/bin/tests/system/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2
index 8a37c83c146fd9d6d3cee414b84ead3c22f9ef66..18bfaac55ed9e047c4eb4dc6e1c4cf183cc06c94 100644 (file)
--- a/bin/tests/system/inline/ns6/named.conf.j2
+++ b/bin/tests/system/inline/ns6/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify-delay 0;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/inline/ns7/named.conf.j2 b/bin/tests/system/inline/ns7/named.conf.j2
index 859bf1cf03359b93be19b966316420c2c4fe9802..1ee42edea76a38093cc6590fa0b7835560734328 100644 (file)
--- a/bin/tests/system/inline/ns7/named.conf.j2
+++ b/bin/tests/system/inline/ns7/named.conf.j2
@@ -17,13 +17,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
        notify no;

diff --git a/bin/tests/system/inline/ns8/named.conf.j2 b/bin/tests/system/inline/ns8/named.conf.j2
index 03a116a57eccc6ae4d8979d066d767af96f82827..c35b9e4c50b01b5bef39add2929e97e7e343438b 100644 (file)
--- a/bin/tests/system/inline/ns8/named.conf.j2
+++ b/bin/tests/system/inline/ns8/named.conf.j2
@@ -3,14 +3,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
        recursion no;
        try-tcp-refresh no;
        notify-delay 0;

diff --git a/bin/tests/system/integrity/ns1/named.conf.j2 b/bin/tests/system/integrity/ns1/named.conf.j2
index f4fe79f430c5109e7fbf5a5f8a7ed2735064a585..f55bb75d543f7e925015254f661034597488f78f 100644 (file)
--- a/bin/tests/system/integrity/ns1/named.conf.j2
+++ b/bin/tests/system/integrity/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/ixfr/ns1/named.conf.j2 b/bin/tests/system/ixfr/ns1/named.conf.j2
index 4f7b29c9858b001db998de4b1d592d08ca194a57..2e4aeb6d1775e7e14e5476a5f9b520180e999eee 100644 (file)
--- a/bin/tests/system/ixfr/ns1/named.conf.j2
+++ b/bin/tests/system/ixfr/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/ixfr/ns3/named.conf.j2 b/bin/tests/system/ixfr/ns3/named.conf.j2
index 474375416d60a3a5bbfa660c93fac8b73a222b54..e246721c03f2576525df47bba4089e2e569b366e 100644 (file)
--- a/bin/tests/system/ixfr/ns3/named.conf.j2
+++ b/bin/tests/system/ixfr/ns3/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/ixfr/ns4/named.conf.j2 b/bin/tests/system/ixfr/ns4/named.conf.j2
index 0b7c5c009cbda9d93038fbbe4d2bfcabea0831f7..405d773c974c39fc85d08d7ac6c4e9f0afb820d6 100644 (file)
--- a/bin/tests/system/ixfr/ns4/named.conf.j2
+++ b/bin/tests/system/ixfr/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/ixfr/ns5/named.conf.j2 b/bin/tests/system/ixfr/ns5/named.conf.j2
index 80ce8a28eccd330d9168645ef05a9f2d48ee25e0..f436da16c5d152fb5e54b1e1f9e1acb9c6a0f8d8 100644 (file)
--- a/bin/tests/system/ixfr/ns5/named.conf.j2
+++ b/bin/tests/system/ixfr/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        provide-ixfr no;

diff --git a/bin/tests/system/journal/ns1/named.conf.j2 b/bin/tests/system/journal/ns1/named.conf.j2
index 16a92ad5fe29544db5be86d5a2449cea56cd2bc1..5e89dbb7f8752125158a5b2a6fb12dd73e1d5503 100644 (file)
--- a/bin/tests/system/journal/ns1/named.conf.j2
+++ b/bin/tests/system/journal/ns1/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        dnssec-validation auto;
        minimal-responses no;
        recursion no;

diff --git a/bin/tests/system/journal/ns2/named.conf.j2 b/bin/tests/system/journal/ns2/named.conf.j2
index b22f6fd370e6437b0580feaef92a069ff15408ec..7a3516c6995f61f9326fad738b17e9cd92dc3f0e 100644 (file)
--- a/bin/tests/system/journal/ns2/named.conf.j2
+++ b/bin/tests/system/journal/ns2/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        dnssec-validation auto;
        minimal-responses no;
        recursion no;

diff --git a/bin/tests/system/kasp/ns1/named.conf.j2 b/bin/tests/system/kasp/ns1/named.conf.j2
index fc603c9e18d545ba52ce50d31dec4479b1f5ee4b..fe8c500e61457511b3307d15b19ab6bc4a239bfc 100644 (file)
--- a/bin/tests/system/kasp/ns1/named.conf.j2
+++ b/bin/tests/system/kasp/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
         allow-transfer { any; };
 };

diff --git a/bin/tests/system/kasp/ns2/named.conf.j2 b/bin/tests/system/kasp/ns2/named.conf.j2
index d6b5e93f4fcdf4b1bb91e0218ebd3bf308ca3af3..0fe78779b5e8345e3694f50e7d7a272697acfbe6 100644 (file)
--- a/bin/tests/system/kasp/ns2/named.conf.j2
+++ b/bin/tests/system/kasp/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-policy "none";

diff --git a/bin/tests/system/kasp/ns3/named-common.conf.j2 b/bin/tests/system/kasp/ns3/named-common.conf.j2
index cf5b063a2a3e8d730f51fb466b4c987b563ba7bd..6e1a8ed19fc2fa58181a31c0eb6e8dd46077b841 100644 (file)
--- a/bin/tests/system/kasp/ns3/named-common.conf.j2
+++ b/bin/tests/system/kasp/ns3/named-common.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-policy "rsasha256";

diff --git a/bin/tests/system/kasp/ns4/named.conf.j2 b/bin/tests/system/kasp/ns4/named.conf.j2
index c1a21851d4269a623592878b97547b1ef7ae7e85..6448765803c8ba2d3cb6ef9ff2d624ddc851c7d1 100644 (file)
--- a/bin/tests/system/kasp/ns4/named.conf.j2
+++ b/bin/tests/system/kasp/ns4/named.conf.j2
@@ -41,13 +41,7 @@ dnssec-policy "test" {
 };
 
 options {
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       query-source address 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-policy "test";

diff --git a/bin/tests/system/kasp/ns5/named.conf.j2 b/bin/tests/system/kasp/ns5/named.conf.j2
index 246df51f043b677bcdccfbb5d303db7f1a1058da..6500900b86bebf2fa9b8f27d9090206da38edc3b 100644 (file)
--- a/bin/tests/system/kasp/ns5/named.conf.j2
+++ b/bin/tests/system/kasp/ns5/named.conf.j2
@@ -24,13 +24,7 @@ dnssec-policy "test" {
 };
 
 options {
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       query-source address 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-policy "none";

diff --git a/bin/tests/system/kasp/ns6/named.conf.j2 b/bin/tests/system/kasp/ns6/named.conf.j2
index e77a9ddf5b1456b203db37ca299a7bb10ad5d6d4..0e9a884c2697a66243d281e6a4b42c9540429a4d 100644 (file)
--- a/bin/tests/system/kasp/ns6/named.conf.j2
+++ b/bin/tests/system/kasp/ns6/named.conf.j2
@@ -4,13 +4,7 @@ include "policies/kasp.conf";
 include "policies/csk1.conf";
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        key-directory ".";

diff --git a/bin/tests/system/keepalive/ns1/named.conf.j2 b/bin/tests/system/keepalive/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/keepalive/ns1/named.conf.j2
+++ b/bin/tests/system/keepalive/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/keepalive/ns2/named.conf.j2 b/bin/tests/system/keepalive/ns2/named.conf.j2
index 1d6ef54ec4848ab5e2e5b7506daeb23e03525e12..e4e9efd42e3b0839c197a8b94e59c929c28ca28e 100644 (file)
--- a/bin/tests/system/keepalive/ns2/named.conf.j2
+++ b/bin/tests/system/keepalive/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        send-cookie yes;
        tcp-advertised-timeout 150;
        dnssec-validation no;

diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2
index a233dd247d025679df1249d5bef7f94390ebd0a9..a9bbe5c9133349ab27b59b28e21fa50fa9585236 100644 (file)
--- a/bin/tests/system/keepalive/ns3/named.conf.j2
+++ b/bin/tests/system/keepalive/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/ksr/ns1/named.conf.j2 b/bin/tests/system/ksr/ns1/named.conf.j2
index b0f3c8706eb528c45323ffd5a86855af5b1b5251..1e9d3eb1cbf435efdf6645070fbf90c9708daf84 100644 (file)
--- a/bin/tests/system/ksr/ns1/named.conf.j2
+++ b/bin/tests/system/ksr/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/legacy/ns1/named.conf.j2 b/bin/tests/system/legacy/ns1/named.conf.j2
index 418801fda6e813d30145e07348dfcca4e1699fca..edbe8313640f95ef6f3d0d99f8708fe26c7853ff 100644 (file)
--- a/bin/tests/system/legacy/ns1/named.conf.j2
+++ b/bin/tests/system/legacy/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% set dnssec_validation = dnssec_validation | default("no") %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation @dnssec_validation@;
 };
 

diff --git a/bin/tests/system/legacy/ns10/named.conf.j2 b/bin/tests/system/legacy/ns10/named.conf.j2
index 094e6f14e15ac682c55738e00da13744a2aa706c..7f8864809919cb37b92792f24aa451309fda000e 100644 (file)
--- a/bin/tests/system/legacy/ns10/named.conf.j2
+++ b/bin/tests/system/legacy/ns10/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.10; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns2/named.conf.j2 b/bin/tests/system/legacy/ns2/named.conf.j2
index 38a165bbd370ca18d9ed6edfb0176b5f66a61296..cdd2c09166dac950d59698c4f102239e22da32b3 100644 (file)
--- a/bin/tests/system/legacy/ns2/named.conf.j2
+++ b/bin/tests/system/legacy/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns3/named.conf.j2 b/bin/tests/system/legacy/ns3/named.conf.j2
index 1a77304d6323eff2d52f5553a1efa4d610839cd3..559bdf252cf136e53666d4a3d3bdcaf0cd393277 100644 (file)
--- a/bin/tests/system/legacy/ns3/named.conf.j2
+++ b/bin/tests/system/legacy/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns4/named.conf.j2 b/bin/tests/system/legacy/ns4/named.conf.j2
index e90fa7f8dd2aac0b052bf5b910677792a6ae8420..971d4e1d3177f7cfbec7f4d607fee420371a7d81 100644 (file)
--- a/bin/tests/system/legacy/ns4/named.conf.j2
+++ b/bin/tests/system/legacy/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns5/named.conf.j2 b/bin/tests/system/legacy/ns5/named.conf.j2
index 7f84ed4a3ce836b5ebdd04d2365ab638011e97d6..38f6f0dda414dfd1270dabc9d5fb7a5c48072c3b 100644 (file)
--- a/bin/tests/system/legacy/ns5/named.conf.j2
+++ b/bin/tests/system/legacy/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns6/named.conf.j2 b/bin/tests/system/legacy/ns6/named.conf.j2
index 340f066574704d7f710172e70a5cf56cb940b732..cae957a559bd16f0ba62eb2784c3162957d09a7f 100644 (file)
--- a/bin/tests/system/legacy/ns6/named.conf.j2
+++ b/bin/tests/system/legacy/ns6/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns7/named.conf.j2 b/bin/tests/system/legacy/ns7/named.conf.j2
index d141a6366c83223f16062adcff46a58e5722a099..65907508d0caa6a4a078a4a049cdc892f35d2a0e 100644 (file)
--- a/bin/tests/system/legacy/ns7/named.conf.j2
+++ b/bin/tests/system/legacy/ns7/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns8/named.conf.j2 b/bin/tests/system/legacy/ns8/named.conf.j2
index 4a759fcd5d3c50e9a4d45812568f14f060c3d385..2dbffa65a8a7e0010cd3bc9d3ecc707225f3532e 100644 (file)
--- a/bin/tests/system/legacy/ns8/named.conf.j2
+++ b/bin/tests/system/legacy/ns8/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/legacy/ns9/named.conf.j2 b/bin/tests/system/legacy/ns9/named.conf.j2
index 21843140738abd0ac79aa874b135f8ed2acea55f..730c98f631aff87bf34d2ff96df4ba8484873ba8 100644 (file)
--- a/bin/tests/system/legacy/ns9/named.conf.j2
+++ b/bin/tests/system/legacy/ns9/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/limits/ns1/named.conf.j2 b/bin/tests/system/limits/ns1/named.conf.j2
index c9dfa410a96025ca2f36df7907b20b5425ab4fe9..9774b7ec0c42485c29e58899ee08bdba9cb751ef 100644 (file)
--- a/bin/tests/system/limits/ns1/named.conf.j2
+++ b/bin/tests/system/limits/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2
index 4e81f26d082d89c2016b784453ff7df028c9c4cd..dd2a95f700d383e05c5937ec70e0185f18bbcc9d 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2
index cb25c10c58e5a651eae147eb601e10b0cf367b93..f927b80fd164fc4d6ad0c3c68a237b5d02b1d3c7 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.dir.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2
index 415c9ad1f5b2fbd59b2911bc85aa592acfdb8406..e9f8122deb7357f01ab9db0799b80913c765147e 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.inc.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

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 2131bb0c4cb039be80e9397e194b3ddc4768a3fa..5d896b06e7c0ed9987354c918ed3dfddd2c48ad8 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2
index 427609862fa71e8efd7aa5978fae3b9d7f8da4e5..56b54780c770cc24a2466c3c6c1265d7529a93e0 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2
index d4dd9c607fd53530f0b41414ee094736643b2a2e..ac1c0359041325bf1783a0dd2719612a0a788678 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2
index 20116e380edeb6f90c69eaed816564fe0b84f5b1..3d88f40810def0335a6d01deb71f3690c60164af 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.plain.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2
index 5980f7e49663fd5c28fc19e5b6065bec5d8f9b34..fda38e63ba284c1b77560d286e14210bf2fbb918 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2
index 1ede6c1f512bfee896cadf1b68e28b28c2c6758a..fbbc66180dcdc1dd23c0f6c07389ca1c2b8b77bc 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.sym.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2
index 33feb6d9beb9fea5cada3fc1f7891c6ca8e3df6f..db37240c6aaacf86ae52bebdebd51799683117b1 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.ts.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2
index aafd275f29f7e534ffb32cc24026c63c511badcf..83139ad351f669073a773a2e59ac039f2f130376 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2
index 6350c251057f52d22d1147fd3141a6885ea61539..2accce0b4e6f830a5a8393054184c82156c7e383 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2
+++ b/bin/tests/system/logfileconfig/ns1/named.vers.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/masterfile/ns1/named.conf.j2 b/bin/tests/system/masterfile/ns1/named.conf.j2
index 469dab78c47cd32c98c1e56dafeced43bd59a138..e7db5269dc24998d514f005fddd9f0a4a471b72c 100644 (file)
--- a/bin/tests/system/masterfile/ns1/named.conf.j2
+++ b/bin/tests/system/masterfile/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/masterfile/ns2/named.conf.j2 b/bin/tests/system/masterfile/ns2/named.conf.j2
index 464cbde118929b9ec3fbe3a0d2f2ed669fc34c05..e556e97d5860d6f165e2dee7be23866f08b8d79b 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.j2
+++ b/bin/tests/system/masterfile/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/masterformat/ns1/named.conf.j2 b/bin/tests/system/masterformat/ns1/named.conf.j2
index 3d4f4538af2310adf4497fdaa8c22058a4928371..e48899938e531cb0b58dce70cfa6afaa56edee06 100644 (file)
--- a/bin/tests/system/masterformat/ns1/named.conf.j2
+++ b/bin/tests/system/masterformat/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       port @PORT@;
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        session-keyfile "session.key";

diff --git a/bin/tests/system/masterformat/ns2/named.conf.j2 b/bin/tests/system/masterformat/ns2/named.conf.j2
index 5f35b8c58af6cc8573a850480b12055e60da9e68..a388cb75d3ba8c655b440a1774a4b6b8cca8030d 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf.j2
+++ b/bin/tests/system/masterformat/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        servfail-ttl 0;

diff --git a/bin/tests/system/masterformat/ns3/named.conf.j2 b/bin/tests/system/masterformat/ns3/named.conf.j2
index 77ab423e7dc1b0207f5a3209b2fc84e9386bcd1e..e0ca869764aa722f89ceb9cf3b4fe8b9ec4975ee 100644 (file)
--- a/bin/tests/system/masterformat/ns3/named.conf.j2
+++ b/bin/tests/system/masterformat/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       port @PORT@;
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation no;

diff --git a/bin/tests/system/masterformat/ns4/named.conf.j2 b/bin/tests/system/masterformat/ns4/named.conf.j2
index f10a44f90e2f9c4be01cfc4a60578a803b445c3b..29ec9abc93cf18083764c6a3fe16c3e7ffe68a1c 100644 (file)
--- a/bin/tests/system/masterformat/ns4/named.conf.j2
+++ b/bin/tests/system/masterformat/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       port @PORT@;
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        session-keyfile "session.key";

diff --git a/bin/tests/system/masterformat/ns4/named2.conf.j2 b/bin/tests/system/masterformat/ns4/named2.conf.j2
index 8c41db2db995ab7138fb41ac4eefd2924bede092..7c1440ef89e8f67ceaf9fe012e3ccf8b31711725 100644 (file)
--- a/bin/tests/system/masterformat/ns4/named2.conf.j2
+++ b/bin/tests/system/masterformat/ns4/named2.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       port @PORT@;
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        session-keyfile "session.key";

diff --git a/bin/tests/system/migrate2kasp/ns3/named.conf.j2 b/bin/tests/system/migrate2kasp/ns3/named.conf.j2
index a78c1c5dc46a45e130ffe0b9f923dfb63f34dbd3..fb9686812974025105cb766d19bd6e329b279bc2 100644 (file)
--- a/bin/tests/system/migrate2kasp/ns3/named.conf.j2
+++ b/bin/tests/system/migrate2kasp/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 include "kasp.conf";
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/migrate2kasp/ns4/named.conf.j2 b/bin/tests/system/migrate2kasp/ns4/named.conf.j2
index 2c4c9623061651fa2c8b63b1ebbbc6064087ad0c..b2836b28be632e8de05b0bbebccc79855044227d 100644 (file)
--- a/bin/tests/system/migrate2kasp/ns4/named.conf.j2
+++ b/bin/tests/system/migrate2kasp/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        key-directory ".";

diff --git a/bin/tests/system/minimalresponses/ns1/named.conf.j2 b/bin/tests/system/minimalresponses/ns1/named.conf.j2
index fd2ee857681ec741f74c0d1f6baa61365c54214e..4fe7071a362315b43abba4b035d349d166fb200a 100644 (file)
--- a/bin/tests/system/minimalresponses/ns1/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% set minresp = minresp | default("yes") %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        minimal-responses @minresp@;
 };

diff --git a/bin/tests/system/minimalresponses/ns2/named.conf.j2 b/bin/tests/system/minimalresponses/ns2/named.conf.j2
index 8367e1eae465353920b0e6a87b812342ee04787a..0d41326a7a647b7580e584da0e17fc285cf06e0f 100644 (file)
--- a/bin/tests/system/minimalresponses/ns2/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% set minresp = minresp | default("yes") %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-responses @minresp@;

diff --git a/bin/tests/system/minimalresponses/ns3/named.conf.j2 b/bin/tests/system/minimalresponses/ns3/named.conf.j2
index fab85796083d2c5f22889c3a5ddac53ac2d806fa..c7128cd60cf44916f52d0e419dcce8666787fdb7 100644 (file)
--- a/bin/tests/system/minimalresponses/ns3/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% set minresp = minresp | default("yes") %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        minimal-responses @minresp@;
 };

diff --git a/bin/tests/system/minimalresponses/ns4/named.conf.j2 b/bin/tests/system/minimalresponses/ns4/named.conf.j2
index 4dfba0ce5f04f68456f9f6d9b08b6fa1ed9fcab8..2ebff3c1ce948bb7859ddb065fc5a6f1e1d6ac44 100644 (file)
--- a/bin/tests/system/minimalresponses/ns4/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 {% set minresp = minresp | default("yes") %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        minimal-responses @minresp@;
 };

diff --git a/bin/tests/system/mirror/ns1/named.conf.j2 b/bin/tests/system/mirror/ns1/named.conf.j2
index bcb8c46c7d4f91df749b23d85bf5d1152f27ca15..bc531023d68ebaa3f5f9c5c87b10ac1c2684fd26 100644 (file)
--- a/bin/tests/system/mirror/ns1/named.conf.j2
+++ b/bin/tests/system/mirror/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/mirror/ns2/named.conf.j2 b/bin/tests/system/mirror/ns2/named.conf.j2
index 2d82ba105c0b62cd582b34ed781472e7f594ea5e..9d11e2ee3d8404be430f49d884d1a8e95d2f5034 100644 (file)
--- a/bin/tests/system/mirror/ns2/named.conf.j2
+++ b/bin/tests/system/mirror/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/mirror/ns3/named.conf.j2 b/bin/tests/system/mirror/ns3/named.conf.j2
index c45d1904f3ce837836183dc2eb4b83901a7ed551..693ba93f4f87c1151c0ca0c3676f384132032e0f 100644 (file)
--- a/bin/tests/system/mirror/ns3/named.conf.j2
+++ b/bin/tests/system/mirror/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query-cache { 10.53.0.1; };
        trust-anchor-telemetry yes;
        allow-new-zones yes;

diff --git a/bin/tests/system/mismatchtcp/ns1/named.conf.j2 b/bin/tests/system/mismatchtcp/ns1/named.conf.j2
index 6c4f912f4d30da6ea0c2c8c821155a9c8db63b90..8cbd793564306829f1908888d96fe6a11b60672f 100644 (file)
--- a/bin/tests/system/mismatchtcp/ns1/named.conf.j2
+++ b/bin/tests/system/mismatchtcp/ns1/named.conf.j2
@@ -14,13 +14,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
-       query-source address 10.53.0.1;
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/mkeys/ns1/named.conf.j2 b/bin/tests/system/mkeys/ns1/named.conf.j2
index 6da24a56d38b848c44cce80608df33dd24872bc9..bff9cb6a4ed0332d764f12db3322dc86a5bc864b 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named.conf.j2
+++ b/bin/tests/system/mkeys/ns1/named.conf.j2
@@ -6,13 +6,7 @@ acl allowed {
 };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation no;

diff --git a/bin/tests/system/mkeys/ns1/named2.conf.j2 b/bin/tests/system/mkeys/ns1/named2.conf.j2
index 6da24a56d38b848c44cce80608df33dd24872bc9..bff9cb6a4ed0332d764f12db3322dc86a5bc864b 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named2.conf.j2
+++ b/bin/tests/system/mkeys/ns1/named2.conf.j2
@@ -6,13 +6,7 @@ acl allowed {
 };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation no;

diff --git a/bin/tests/system/mkeys/ns1/named3.conf.j2 b/bin/tests/system/mkeys/ns1/named3.conf.j2
index ab3ec88ff9628180ad9e28690118d7a17b9fbda8..218c2f18dc98d6b5fdd945436203f22a3f9c51fe 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named3.conf.j2
+++ b/bin/tests/system/mkeys/ns1/named3.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation no;

diff --git a/bin/tests/system/mkeys/ns2/named.conf.j2 b/bin/tests/system/mkeys/ns2/named.conf.j2
index 01b3c0501a70e6042338fadffe8a666cde27c476..d16a02c327c175b9262e9f52fcfddc6d6a74c481 100644 (file)
--- a/bin/tests/system/mkeys/ns2/named.conf.j2
+++ b/bin/tests/system/mkeys/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation auto;
        servfail-ttl 0;

diff --git a/bin/tests/system/mkeys/ns3/named.conf.j2 b/bin/tests/system/mkeys/ns3/named.conf.j2
index 1e62a70f8c1dba77c54431e63e114cc161906c6b..970878a1403cfd15c8265c048381644181c88cc4 100644 (file)
--- a/bin/tests/system/mkeys/ns3/named.conf.j2
+++ b/bin/tests/system/mkeys/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation auto;
        trust-anchor-telemetry no;

diff --git a/bin/tests/system/mkeys/ns4/named.conf.j2 b/bin/tests/system/mkeys/ns4/named.conf.j2
index cc0673ec2cd202460730ae8e6be7fe746c746e28..1b28bc3243b99142e880371364cbcd83476944b2 100644 (file)
--- a/bin/tests/system/mkeys/ns4/named.conf.j2
+++ b/bin/tests/system/mkeys/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation auto;
        managed-keys-directory "nope";

diff --git a/bin/tests/system/mkeys/ns5/named.conf.j2 b/bin/tests/system/mkeys/ns5/named.conf.j2
index 05d65e2d64452c61bf0f9cc6ab2933843842d8af..89a40a5279b97c552844450af85fecbc8163ae84 100644 (file)
--- a/bin/tests/system/mkeys/ns5/named.conf.j2
+++ b/bin/tests/system/mkeys/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation auto;
        servfail-ttl 0;

diff --git a/bin/tests/system/mkeys/ns6/named.conf.j2 b/bin/tests/system/mkeys/ns6/named.conf.j2
index d55054a84e9bb7c4ac19823f86e4d4dd16dd7b44..a8da3412af81730d559526d82d4a745b0207f097 100644 (file)
--- a/bin/tests/system/mkeys/ns6/named.conf.j2
+++ b/bin/tests/system/mkeys/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation auto;
        trust-anchor-telemetry no;

diff --git a/bin/tests/system/mkeys/ns7/named.conf.j2 b/bin/tests/system/mkeys/ns7/named.conf.j2
index f7c2486dc3ba00d59ea16b37391c5284243f5cc3..e2eaa065b035c7c48692c4dd41aaeff471489436 100644 (file)
--- a/bin/tests/system/mkeys/ns7/named.conf.j2
+++ b/bin/tests/system/mkeys/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 // NS7
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation auto;
 };

diff --git a/bin/tests/system/multisigner/ns1/named.conf.j2 b/bin/tests/system/multisigner/ns1/named.conf.j2
index eccb9fa2d3cde68de1faeddd1e5fa1d64b7d9559..e896318ee499efaa21679e19dc4bd92912b01487 100644 (file)
--- a/bin/tests/system/multisigner/ns1/named.conf.j2
+++ b/bin/tests/system/multisigner/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/multisigner/ns2/named.conf.j2 b/bin/tests/system/multisigner/ns2/named.conf.j2
index 95cd4a70aee5ecbb589bedc0ade84131ce59d084..42a649d586b0769db9b44c08882fd05592f3dedb 100644 (file)
--- a/bin/tests/system/multisigner/ns2/named.conf.j2
+++ b/bin/tests/system/multisigner/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        allow-notify { 10.53.0.3; 10.53.0.4; };
        dnssec-validation no;

diff --git a/bin/tests/system/multisigner/ns3/named.conf.j2 b/bin/tests/system/multisigner/ns3/named.conf.j2
index 40bf9bd1e4459e4374885f419ac70f88689c0204..05553bfd8db87d5ceec87c825963b1caeab5aaf5 100644 (file)
--- a/bin/tests/system/multisigner/ns3/named.conf.j2
+++ b/bin/tests/system/multisigner/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 include "../kasp.conf";
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        key-directory ".";
        dnssec-validation yes;

diff --git a/bin/tests/system/multisigner/ns4/named.conf.j2 b/bin/tests/system/multisigner/ns4/named.conf.j2
index d72bdec005146d56fc6ab2d099b6984d75a825eb..d949a39096611a3aaa3a79cdedc9744b086e9a46 100644 (file)
--- a/bin/tests/system/multisigner/ns4/named.conf.j2
+++ b/bin/tests/system/multisigner/ns4/named.conf.j2
@@ -3,13 +3,7 @@
 include "../kasp.conf";
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        key-directory ".";
        dnssec-validation yes;

diff --git a/bin/tests/system/multisigner/ns5/named.conf.j2 b/bin/tests/system/multisigner/ns5/named.conf.j2
index dffde83ad8b942e51ce6a6788b91edf8bc985b57..0774490484b2480b19f661986280d29f9c36336c 100644 (file)
--- a/bin/tests/system/multisigner/ns5/named.conf.j2
+++ b/bin/tests/system/multisigner/ns5/named.conf.j2
@@ -3,13 +3,7 @@
 include "../kasp.conf";
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        key-directory ".";
        dnssec-validation no;

diff --git a/bin/tests/system/names/ns1/named.conf.j2 b/bin/tests/system/names/ns1/named.conf.j2
index 5f4045e7cee02857c3466cba3ac8b247fd238679..94a29055d8505cfd58bb5af258b7864570720ec3 100644 (file)
--- a/bin/tests/system/names/ns1/named.conf.j2
+++ b/bin/tests/system/names/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        ixfr-from-differences yes;
        check-integrity no;

diff --git a/bin/tests/system/notify/ns1/named.conf.j2 b/bin/tests/system/notify/ns1/named.conf.j2
index 115f59ee887c80ab9470ff0edcb0cabed5ea9030..1c5627ed5dbc7173bab5acf5130311c6e385597e 100644 (file)
--- a/bin/tests/system/notify/ns1/named.conf.j2
+++ b/bin/tests/system/notify/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
+       {% include_indented "_common/options.conf.j2" %}
        # invalid notify-source-v6 address
        notify-source-v6 fd92:7065:b8e:fffe::a35:5;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2
index 684f9f16bc80b8ad5a8548d5416921974ae8134c..994d9b2fb3870ceadef006fe85cfe095cf55a1f0 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf.j2
+++ b/bin/tests/system/notify/ns2/named.conf.j2
@@ -3,14 +3,8 @@ include "named-tls.conf";
 {% endif %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
+       {% include_indented "_common/options.conf.j2" %}
        notify-source-v6 fd92:7065:b8e:ffff::2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        recursion no;
        startup-notify-rate 5;

diff --git a/bin/tests/system/notify/ns5/named.conf.j2 b/bin/tests/system/notify/ns5/named.conf.j2
index bfc2609cbfd31b07057a3f1efe95db70afbfeb1e..a11ac03855fed500feb14edea76bb95e25922fc1 100644 (file)
--- a/bin/tests/system/notify/ns5/named.conf.j2
+++ b/bin/tests/system/notify/ns5/named.conf.j2
@@ -14,13 +14,7 @@ key "c" {
 };
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsec/ns1/named.conf.j2 b/bin/tests/system/nsec/ns1/named.conf.j2
index 07a1de53defd80ed2ad9a84f4a3dbad0caf3229e..585a87b6ebf851f768afdeb55e5a3a1d65f68630 100644 (file)
--- a/bin/tests/system/nsec/ns1/named.conf.j2
+++ b/bin/tests/system/nsec/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/nsec/ns2/named.conf.j2 b/bin/tests/system/nsec/ns2/named.conf.j2
index bf56e7ee7773e637ff33418c08e596afce0884af..ec7248af3888172e933d03f32ef08223fdd50630 100644 (file)
--- a/bin/tests/system/nsec/ns2/named.conf.j2
+++ b/bin/tests/system/nsec/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/nsec/ns3/named.conf.j2 b/bin/tests/system/nsec/ns3/named.conf.j2
index b4d717493239a2b2decae387d40d9aefb2f10cf6..5e7c3ecd98241310906d071f1d62c25055a5bf24 100644 (file)
--- a/bin/tests/system/nsec/ns3/named.conf.j2
+++ b/bin/tests/system/nsec/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 
        max-records-per-type 2;

diff --git a/bin/tests/system/nsec3/ns2/named.conf.j2 b/bin/tests/system/nsec3/ns2/named.conf.j2
index a1195e9e66324b0060d95ac74a0b9f77620873dd..170704b0206f5bf283d2eb8f1890adc3c39a9feb 100644 (file)
--- a/bin/tests/system/nsec3/ns2/named.conf.j2
+++ b/bin/tests/system/nsec3/ns2/named.conf.j2
@@ -5,13 +5,7 @@ dnssec-policy "nsec3" {
 };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsec3/ns3/named-common.conf.j2 b/bin/tests/system/nsec3/ns3/named-common.conf.j2
index 9e980b4e2b3f43ce5f18b4c694dde4d6ae51e033..63938fc7079a378bc979d8e31374a88ffe1f6c2f 100644 (file)
--- a/bin/tests/system/nsec3/ns3/named-common.conf.j2
+++ b/bin/tests/system/nsec3/ns3/named-common.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsec3/ns4/named.conf.j2 b/bin/tests/system/nsec3/ns4/named.conf.j2
index 83a3e1bb3c9335c7c53f32fb6d45b9bec1ad0cf7..7a00e92f2f003ee009ee9134f323d83e876e76be 100644 (file)
--- a/bin/tests/system/nsec3/ns4/named.conf.j2
+++ b/bin/tests/system/nsec3/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsec3/ns5/named.conf.j2 b/bin/tests/system/nsec3/ns5/named.conf.j2
index cadf43485084419923a338da7250a836613c1c49..a41db29701e0464f9bf684d722c19ac08a501a89 100644 (file)
--- a/bin/tests/system/nsec3/ns5/named.conf.j2
+++ b/bin/tests/system/nsec3/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation yes;
        send-cookie no;

diff --git a/bin/tests/system/nsec3/ns6/named.conf.j2 b/bin/tests/system/nsec3/ns6/named.conf.j2
index 7be0738383a78337662fb974cb04b004433d0bc6..909fdd457c1d4f498d4d5255c95d0cbc209dc46c 100644 (file)
--- a/bin/tests/system/nsec3/ns6/named.conf.j2
+++ b/bin/tests/system/nsec3/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
index 5e5f1b509841b1e7eb997b5d612905c6fdbd7f0a..7193ba0e48b0c9f5353de0108f7857207000e144 100644 (file)
--- a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
+++ b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
index af3f31fe6765acbb67fd8d0a808f9c5ec91bb2f8..9a34387e7773fe09e9c4da9b178758dc955a338d 100644 (file)
--- a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        minimal-responses no;
 };

diff --git a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2
index fcd565149e02ee54cc6bb501f4034f3908bf905a..648462e320f5fa8b685095d0e3af8f3697589b91 100644 (file)
--- a/bin/tests/system/nsec_ixfr/ns1/named.conf.j2
+++ b/bin/tests/system/nsec_ixfr/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2 b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2
index 62f7af3d5d291d73db78dddd497d944020be68e9..9583664915ce531b08e28ae7c5e0293d73612c36 100644 (file)
--- a/bin/tests/system/nsec_ixfr/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_ixfr/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2
index 8a3892d1fb904acba836fb264cf68b762c08e36c..6b6a72a30fc446a088c0e2ae3dc859393a4bdc29 100644 (file)
--- a/bin/tests/system/nsec_piggyback/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_piggyback/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        minimal-any no;
        minimal-responses no;

diff --git a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
index fbd80cb1771b4237fd2e249dda5861eeaf0f0c47..8e79c395f080f564a83dca14012fdbd3636c2f22 100644 (file)
--- a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        synth-from-dnssec yes;
 };

diff --git a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
index ee3e3a475421d03a83d0ae040bf9446d91f764e6..8b6e1bad2ee4a6683c147e6dd99e4b2abd240db8 100644 (file)
--- a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // validating resolver
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        synth-from-dnssec yes;
 };

diff --git a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
index fda5b0a574d7f506c5cc1c01f65eed8b094498db..75c7de27ecf9e33f945bcd6d8717ca171d0c0731 100644 (file)
--- a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2
index a14fedbb4e7d6ae691c57fdced63af890cccc1c1..3175cc6c78fc8f137a7f7b01028d9591e3678475 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns1/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2 b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2
index 306425dd685ffefb6dac60a76a57393439255dd6..b1e285930c0c81052ad131f7f13b39dd94d1036a 100644 (file)
--- a/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2
+++ b/bin/tests/system/nslimit_outdomain/ns4/named.conf.j2
@@ -13,13 +13,7 @@
 {% set maxdelegationservers = maxdelegationservers | default(None) %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dnstap { resolver query; };
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/nslookup/ns1/named.conf.j2 b/bin/tests/system/nslookup/ns1/named.conf.j2
index 3a5a0a027525f78f75fae1aeddefc9c31fd3f272..3f6dbb2be386a0f4c457f2249b96abd1d44524ef 100644 (file)
--- a/bin/tests/system/nslookup/ns1/named.conf.j2
+++ b/bin/tests/system/nslookup/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2
index 42dba75f8691263658b240469e521b1dc5da9e0c..e67326a1a75ff3a5e80c36c11daec5c13e751b85 100644 (file)
--- a/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2
+++ b/bin/tests/system/nsprocessinglimit/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2
index d0b75bf8657a61a9e13d493dd0219fa3ce0dfa7d..1b47dbf9bdd9b930c1c9b2b44a061bcaec1a1b78 100644 (file)
--- a/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2
+++ b/bin/tests/system/nsprocessinglimit/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2
index bca15ee2ee8e34e1b43676a59b9beca4dc62f841..0868ddd59c9eaf902e8d178864710dd3f4e41a6b 100644 (file)
--- a/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2
+++ b/bin/tests/system/nsprocessinglimit/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2 b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2
index f9f1535550f838b842d7560529c96a5a9ee1ab59..a98b247f3a83aeb5838513a7953d75029fb62b2e 100644 (file)
--- a/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2
+++ b/bin/tests/system/nsprocessinglimit/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 {% set maxdelegationservers = maxdelegationservers | default(None) %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dnstap { resolver query; };
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/nsupdate/ns10/named.conf.j2 b/bin/tests/system/nsupdate/ns10/named.conf.j2
index 1ac4f6dfbebd686dea19884b95527bc909dfb837..1d870364acd4494a9512e975514aa0b4eeec5621 100644 (file)
--- a/bin/tests/system/nsupdate/ns10/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns10/named.conf.j2
@@ -1,14 +1,8 @@
 options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
        session-keyfile "session.key";
-       listen-on { 10.53.0.10; };
        listen-on tls ephemeral { 10.53.0.10; };
-       listen-on-v6 { none; };
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsupdate/ns2/named.conf.j2 b/bin/tests/system/nsupdate/ns2/named.conf.j2
index 2264cff2c809941b3af3a3b615664c7df8f6f669..8a3bcf6c01443a708d6788718b64aa29fa779651 100644 (file)
--- a/bin/tests/system/nsupdate/ns2/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        serial-query-rate 1; // workaround for KB AA-01213
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsupdate/ns3/named.conf.j2 b/bin/tests/system/nsupdate/ns3/named.conf.j2
index 29724fe1d97ef2d67e01202c93e5d27fc74868b4..307990d78cf047bc847d4ce27b30edfd2b63e6cb 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/nsupdate/ns5/named.conf.j2 b/bin/tests/system/nsupdate/ns5/named.conf.j2
index 3fc8db03708b77ef60015b966a2195d34650ad36..e7c6b38b74f0f8f0b757db7880587d92f96a3a63 100644 (file)
--- a/bin/tests/system/nsupdate/ns5/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns5/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsupdate/ns7/named.conf.j2 b/bin/tests/system/nsupdate/ns7/named.conf.j2
index 9f986a5bb41efc54accad3e7f715f4365eb3378c..816a6edd899839acdea37e6fe172a9896b7ead6c 100644 (file)
--- a/bin/tests/system/nsupdate/ns7/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns7/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsupdate/ns7/named2.conf.j2 b/bin/tests/system/nsupdate/ns7/named2.conf.j2
index a799536ff8d9fb26412a3d206d17e889f0329b15..3f1826a706db6274b6a9839fd679c7aa62fa7c1b 100644 (file)
--- a/bin/tests/system/nsupdate/ns7/named2.conf.j2
+++ b/bin/tests/system/nsupdate/ns7/named2.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsupdate/ns8/named.conf.j2 b/bin/tests/system/nsupdate/ns8/named.conf.j2
index bf811f7c18af2c5e6ccc2ecf65835ac9fe1fb1f2..0b65b70a7a2b81eae573615842783f7e7ada00f7 100644 (file)
--- a/bin/tests/system/nsupdate/ns8/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns8/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/nsupdate/ns9/named.conf.j2 b/bin/tests/system/nsupdate/ns9/named.conf.j2
index f50b4a52a1618b1010281180652afb29cd48f2ce..e8e25be4481301b2ee80b8bab9317a6a7c329c72 100644 (file)
--- a/bin/tests/system/nsupdate/ns9/named.conf.j2
+++ b/bin/tests/system/nsupdate/ns9/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
        recursion no;
        minimal-responses no;
        dnssec-validation no;

diff --git a/bin/tests/system/nta/ns1/named.conf.j2 b/bin/tests/system/nta/ns1/named.conf.j2
index 0249014a6354efab0af9a1097fe7b0f1a31e3932..c53084e4ecdf2a5edc1a4bcf67b0e428c78dbc75 100644 (file)
--- a/bin/tests/system/nta/ns1/named.conf.j2
+++ b/bin/tests/system/nta/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
        /* test that we can turn off trust-anchor-telemetry */

diff --git a/bin/tests/system/nta/ns2/named.conf.j2 b/bin/tests/system/nta/ns2/named.conf.j2
index f2d0182279b5f22c26b9a1d05328f61bd4423297..fc663a2c6bdae10fa94f742c9c71108ad1176833 100644 (file)
--- a/bin/tests/system/nta/ns2/named.conf.j2
+++ b/bin/tests/system/nta/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
         notify-delay 1;

diff --git a/bin/tests/system/nta/ns3/named.conf.j2 b/bin/tests/system/nta/ns3/named.conf.j2
index 9af076aefb0f65454fe1d0fd43a63ec762abddf7..8c5ee71fc317f8f3e017c38f16c36434fd1e78ea 100644 (file)
--- a/bin/tests/system/nta/ns3/named.conf.j2
+++ b/bin/tests/system/nta/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/nta/ns4/named.conf.j2 b/bin/tests/system/nta/ns4/named.conf.j2
index 885a7da507d9fd41bc0eaa8f041b39f0ee81e4f5..98321e1c0d0fbf4517bb4802ebf2e177489ad2d6 100644 (file)
--- a/bin/tests/system/nta/ns4/named.conf.j2
+++ b/bin/tests/system/nta/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        minimal-responses no;
 
        nta-lifetime 12s;

diff --git a/bin/tests/system/nta/ns9/named.conf.j2 b/bin/tests/system/nta/ns9/named.conf.j2
index 2ebdb317959ea7d594e3df7f4ba5bbb0eb3f1d46..05e67fc09bb55945ccd4f294c85f02971607967b 100644 (file)
--- a/bin/tests/system/nta/ns9/named.conf.j2
+++ b/bin/tests/system/nta/ns9/named.conf.j2
@@ -1,13 +1,7 @@
 // NS9
 
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        forward only;
        forwarders { 10.53.0.4; };

diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.j2 b/bin/tests/system/nzd2nzf/ns1/named.conf.j2
index 2af6468871c8f9b6e57127eaa29c2de343b1f96d..05ee7368ba97ced66a955bb71bf51d116d94458a 100644 (file)
--- a/bin/tests/system/nzd2nzf/ns1/named.conf.j2
+++ b/bin/tests/system/nzd2nzf/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        recursion no;
        allow-new-zones yes;

diff --git a/bin/tests/system/optout/ns2/named.conf.j2 b/bin/tests/system/optout/ns2/named.conf.j2
index 4e8ed8ed6ea036c9fe5fbdc31d483dab50124469..62563116add82a89cf80c7cdd407f65c57f3ee97 100644 (file)
--- a/bin/tests/system/optout/ns2/named.conf.j2
+++ b/bin/tests/system/optout/ns2/named.conf.j2
@@ -2,13 +2,7 @@
 {% set policy = "optout" if not reconfiged else "nsec" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-        port @PORT@;
-        pid-file "named.pid";
-        listen-on { 10.53.0.2; };
-        listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
         recursion no;
         dnssec-validation no;

diff --git a/bin/tests/system/padding/ns1/named.conf.j2 b/bin/tests/system/padding/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/padding/ns1/named.conf.j2
+++ b/bin/tests/system/padding/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/padding/ns2/named.conf.j2 b/bin/tests/system/padding/ns2/named.conf.j2
index dce128fc23ae234279e1311bf068afd84ee39659..9ebf12d913f595301127bba2e7282110af92214d 100644 (file)
--- a/bin/tests/system/padding/ns2/named.conf.j2
+++ b/bin/tests/system/padding/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        send-cookie yes;
        response-padding { !10.53.0.8; any; } block-size 64;
        dnssec-validation no;

diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2
index 503ae8c0253b04b6eeb44e8ed78059ac1a6f8ebe..7ee3f0183e0202bb02de68a89251283772ae9ab7 100644 (file)
--- a/bin/tests/system/padding/ns3/named.conf.j2
+++ b/bin/tests/system/padding/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2
index 0077edf19b82bc2a6bf43fd1efd7d5d296105a3c..3b94e5ff43276175b921a8ec4e231747f44f0199 100644 (file)
--- a/bin/tests/system/padding/ns4/named.conf.j2
+++ b/bin/tests/system/padding/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/pending/ns1/named.conf.j2 b/bin/tests/system/pending/ns1/named.conf.j2
index 1b6058a1e5b444f959f19363b11392ebf9a9258f..f09714e96374ef90a0e6170dbec86eaf4d7f574c 100644 (file)
--- a/bin/tests/system/pending/ns1/named.conf.j2
+++ b/bin/tests/system/pending/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 include "trusted.conf";
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/pending/ns2/named.conf.j2 b/bin/tests/system/pending/ns2/named.conf.j2
index f7d805741a7c105f5d64b330bbececa4aa5796bc..78cf1ae21c64dbded63d84635f326b5be7dc8705 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf.j2
+++ b/bin/tests/system/pending/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 include "trusted.conf";
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/pending/ns3/named.conf.j2 b/bin/tests/system/pending/ns3/named.conf.j2
index 3443c5cbee958d9935262048ecf6c965285f3e35..34a912d5e14a87892211dc2a7f90918bff14a1fb 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf.j2
+++ b/bin/tests/system/pending/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 include "trusted.conf";
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
        dnssec-validation yes;

diff --git a/bin/tests/system/pending/ns4/named.conf.j2 b/bin/tests/system/pending/ns4/named.conf.j2
index e66e158f1c379f0a52d05d499571d0194ecd3b1d..3a3d770f99af89ea87ea59b5568168295d18d657 100644 (file)
--- a/bin/tests/system/pending/ns4/named.conf.j2
+++ b/bin/tests/system/pending/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 include "trusted.conf";
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/pipelined/ns1/named.conf.j2 b/bin/tests/system/pipelined/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/pipelined/ns1/named.conf.j2
+++ b/bin/tests/system/pipelined/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2
index 723755fed2902a72906bf63134a1e104bd7b7160..c5cf78303f44798154d4cf8616de4eb5e498ec8b 100644 (file)
--- a/bin/tests/system/pipelined/ns2/named.conf.j2
+++ b/bin/tests/system/pipelined/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2
index c25a777c42d9e78f1fa988607fcf25e5bf0a5708..92fea51cea9446a0a0612c29166ff34a8a5e9ba2 100644 (file)
--- a/bin/tests/system/pipelined/ns3/named.conf.j2
+++ b/bin/tests/system/pipelined/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2
index 57069ab5bce01fd7f3f49e720686d16b69adf5f0..74a532e9d325f0e0cbac31faa088ac56c051f66a 100644 (file)
--- a/bin/tests/system/pipelined/ns4/named.conf.j2
+++ b/bin/tests/system/pipelined/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/qmin/ns1/named.conf.j2 b/bin/tests/system/qmin/ns1/named.conf.j2
index 7542ace9237fd70c168ca89c7198357259584047..00b154fb119c43081dd53f3a5b4448598922a27c 100644 (file)
--- a/bin/tests/system/qmin/ns1/named.conf.j2
+++ b/bin/tests/system/qmin/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/qmin/ns5/named.conf.j2 b/bin/tests/system/qmin/ns5/named.conf.j2
index 051f63106cd9f87815cc0b1beafcb75e0e668098..3a1ba825b3a12afbfa83c484cc674ad6ee9da763 100644 (file)
--- a/bin/tests/system/qmin/ns5/named.conf.j2
+++ b/bin/tests/system/qmin/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        qname-minimization disabled;
        querylog yes;
        resolver-query-timeout 30000; # 30 seconds

diff --git a/bin/tests/system/qmin/ns6/named.conf.j2 b/bin/tests/system/qmin/ns6/named.conf.j2
index 6318d4c3e480caa029ed5749a3fad694eb05ec89..35052b289e5d30861fa6495fdf299066823197d1 100644 (file)
--- a/bin/tests/system/qmin/ns6/named.conf.j2
+++ b/bin/tests/system/qmin/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        qname-minimization strict;
        querylog yes;
        resolver-query-timeout 30000; # 30 seconds

diff --git a/bin/tests/system/qmin/ns7/named.conf.j2 b/bin/tests/system/qmin/ns7/named.conf.j2
index 12f65d0472e5524d24ed1ce4cf707e7a32ae3ea0..765a4e3801c8a293756dcff8ab910f9682b82ffe 100644 (file)
--- a/bin/tests/system/qmin/ns7/named.conf.j2
+++ b/bin/tests/system/qmin/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 // NS7
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        qname-minimization relaxed;
        querylog yes;
        resolver-query-timeout 30000; # 30 seconds

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 8b7a93cc3ae2361eb5475e2579c48af343ce5b74..efa381e6064b3faf557c5cf91428a1a5fe6f5cf9 100644 (file)
--- a/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2
+++ b/bin/tests/system/qpcache_rrsig_any/ns2/named.conf.j2
@@ -14,13 +14,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/randomizens/ns1/named.conf.j2 b/bin/tests/system/randomizens/ns1/named.conf.j2
index 07a1de53defd80ed2ad9a84f4a3dbad0caf3229e..585a87b6ebf851f768afdeb55e5a3a1d65f68630 100644 (file)
--- a/bin/tests/system/randomizens/ns1/named.conf.j2
+++ b/bin/tests/system/randomizens/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/randomizens/ns2/named.conf.j2 b/bin/tests/system/randomizens/ns2/named.conf.j2
index c90ca4a92b828d8752281637f8c015da8f456342..4726d243827c1811ed8843d2492a527796fe2e74 100644 (file)
--- a/bin/tests/system/randomizens/ns2/named.conf.j2
+++ b/bin/tests/system/randomizens/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/randomizens/ns3/named.conf.j2 b/bin/tests/system/randomizens/ns3/named.conf.j2
index 042f5d9e58963aa104e8d3a34f6307b1d7ea15be..5a5d33f4491d47aa5058d5bd0d47ff22500d62d8 100644 (file)
--- a/bin/tests/system/randomizens/ns3/named.conf.j2
+++ b/bin/tests/system/randomizens/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/randomizens/ns4/named.conf.j2 b/bin/tests/system/randomizens/ns4/named.conf.j2
index a5b2bfd1f64b4e4b910e444c22ff13216e870b4e..4bb200bf93830973af001068aef63bd027ee76c2 100644 (file)
--- a/bin/tests/system/randomizens/ns4/named.conf.j2
+++ b/bin/tests/system/randomizens/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/randomizens/ns5/named.conf.j2 b/bin/tests/system/randomizens/ns5/named.conf.j2
index ca2976322d8f5a5b4993882ab441a9f79ffadfb1..834fb2b935f3c74a00872a58d0c21c2bbca7d285 100644 (file)
--- a/bin/tests/system/randomizens/ns5/named.conf.j2
+++ b/bin/tests/system/randomizens/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/randomizens/ns6/named.conf.j2 b/bin/tests/system/randomizens/ns6/named.conf.j2
index da1a169fc7104f6377778250ac53ce6335cc7816..d74ec52867b6f755b3004afa251f73d31b4a5a08 100644 (file)
--- a/bin/tests/system/randomizens/ns6/named.conf.j2
+++ b/bin/tests/system/randomizens/ns6/named.conf.j2
@@ -1,12 +1,6 @@
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/reclimit/ns1/named.conf.j2 b/bin/tests/system/reclimit/ns1/named.conf.j2
index 850c437d3ec092949c3df2c636e7aae53ecd6acc..8b7ab800ad674eede8a1563f2881bf5bc89fb263 100644 (file)
--- a/bin/tests/system/reclimit/ns1/named.conf.j2
+++ b/bin/tests/system/reclimit/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        max-records-per-type 0;

diff --git a/bin/tests/system/reclimit/ns3/named.conf.j2 b/bin/tests/system/reclimit/ns3/named.conf.j2
index 1a4c5a461307851e6e227a3364723b6f69318646..918f3ca678218e7601f707cdd35e4bf74b745d56 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named.conf.j2
+++ b/bin/tests/system/reclimit/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        qname-minimization disabled;
        max-recursion-queries 50;

diff --git a/bin/tests/system/reclimit/ns3/named2.conf.j2 b/bin/tests/system/reclimit/ns3/named2.conf.j2
index c106324b5a1772fa489026a51f7e6cdd494fea65..8f3dee5c2b9a9ff22a3359cfdb13ec1b868c1db4 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named2.conf.j2
+++ b/bin/tests/system/reclimit/ns3/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        qname-minimization disabled;
        max-recursion-depth 5;

diff --git a/bin/tests/system/reclimit/ns3/named3.conf.j2 b/bin/tests/system/reclimit/ns3/named3.conf.j2
index 7d27c387319b2aeccb0dc9d50b86040479b0834c..74c5e45abae6b340dda7713667abfcaa9dcd8752 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named3.conf.j2
+++ b/bin/tests/system/reclimit/ns3/named3.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        qname-minimization disabled;
        max-recursion-depth 100;

diff --git a/bin/tests/system/reclimit/ns3/named4.conf.j2 b/bin/tests/system/reclimit/ns3/named4.conf.j2
index ec5a56062b5546ec9a17fbe92b3a7de61f563271..817936142249f9344a4af6308a41945dc3f0dbf0 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named4.conf.j2
+++ b/bin/tests/system/reclimit/ns3/named4.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        qname-minimization disabled;
        max-recursion-depth 100;

diff --git a/bin/tests/system/reclimit/ns3/named5.conf.j2 b/bin/tests/system/reclimit/ns3/named5.conf.j2
index 934290685d8a9e32cc748386242aa6744da4f939..88e90509acc7ed9deff9e19c02d5b90db76c3882 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named5.conf.j2
+++ b/bin/tests/system/reclimit/ns3/named5.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        qname-minimization disabled;
        max-recursion-depth 12;

diff --git a/bin/tests/system/reclimit/ns3/named6.conf.j2 b/bin/tests/system/reclimit/ns3/named6.conf.j2
index c296961f1d275eae42b6f161535b01143e9f8d31..97b631bc2dc727dd69396d83fedd655fe9221195 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named6.conf.j2
+++ b/bin/tests/system/reclimit/ns3/named6.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        qname-minimization disabled;
        max-recursion-depth 12;

diff --git a/bin/tests/system/redirect/ns1/named.conf.j2 b/bin/tests/system/redirect/ns1/named.conf.j2
index fbc7256218408be52037f4979386454d1a5891f9..4c214c8e2db65da37f65ed74c1bc4c53a1d0083b 100644 (file)
--- a/bin/tests/system/redirect/ns1/named.conf.j2
+++ b/bin/tests/system/redirect/ns1/named.conf.j2
@@ -3,13 +3,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { 10.53.0.1; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/redirect/ns10/named.conf.j2 b/bin/tests/system/redirect/ns10/named.conf.j2
index 37e036c5d087c013f01a693f4302cb07f642ccc1..cf4a24ce8141ab8c5677ad6d4a73aabf8dc8c4f6 100644 (file)
--- a/bin/tests/system/redirect/ns10/named.conf.j2
+++ b/bin/tests/system/redirect/ns10/named.conf.j2
@@ -3,13 +3,7 @@
 // locally, then nxdomain-redirect+dns64 hit the same buggy path as ns7).
 
 options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
-       listen-on { 10.53.0.10; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        nxdomain-redirect redirect;
        dnssec-validation yes;
        synth-from-dnssec yes;

diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2
index 975ecf223579e00a9c50a57cc541ee193701295e..fc8b394c4c5a079fa3520d1f7211a9af41d82b78 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf.j2
+++ b/bin/tests/system/redirect/ns2/named.conf.j2
@@ -3,13 +3,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 
 };

diff --git a/bin/tests/system/redirect/ns3/named.conf.j2 b/bin/tests/system/redirect/ns3/named.conf.j2
index a92d2cf63e8c6d7e7a4da16a49fdbb1b99126d97..74d2ff1a0cce484df79d7d9c25814db8d0351d12 100644 (file)
--- a/bin/tests/system/redirect/ns3/named.conf.j2
+++ b/bin/tests/system/redirect/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-recursion { 10.53.0.3; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/redirect/ns5/named.conf.j2 b/bin/tests/system/redirect/ns5/named.conf.j2
index 2af413e3f7495337302cf7b041dbb1000ffde073..a4bb12c45d41478d7fe6e438b1f7c31684704991 100644 (file)
--- a/bin/tests/system/redirect/ns5/named.conf.j2
+++ b/bin/tests/system/redirect/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        nxdomain-redirect signed;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/redirect/ns6/named.conf.j2 b/bin/tests/system/redirect/ns6/named.conf.j2
index 618b89f024903867f5adb4932e7daa7152478391..94048681700d6eae936ed2f7ffad10a9db901746 100644 (file)
--- a/bin/tests/system/redirect/ns6/named.conf.j2
+++ b/bin/tests/system/redirect/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        nxdomain-redirect unsigned;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/redirect/ns7/named.conf.j2 b/bin/tests/system/redirect/ns7/named.conf.j2
index b5e2aaef382b32c949cba14b307d393f8b8704d4..7feed000e05e0efb75fbf8339ac9e829bc6ea759 100644 (file)
--- a/bin/tests/system/redirect/ns7/named.conf.j2
+++ b/bin/tests/system/redirect/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 // NS7
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        nxdomain-redirect redirect;
        dnssec-validation no;
        dns64 64:ff9b::/96 {

diff --git a/bin/tests/system/redirect/ns8/named.conf.j2 b/bin/tests/system/redirect/ns8/named.conf.j2
index 4c67fb8b5e86e2cf28cbb1b27c0f6dc378d40a25..cf0513c0bbfbadf12c79a95c2f755326cf37ec20 100644 (file)
--- a/bin/tests/system/redirect/ns8/named.conf.j2
+++ b/bin/tests/system/redirect/ns8/named.conf.j2
@@ -1,13 +1,7 @@
 // NS8
 
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        nxdomain-redirect redirect;
        dnssec-validation no;
        dns64 64:ff9b::/96 {

diff --git a/bin/tests/system/redirect/ns9/named.conf.j2 b/bin/tests/system/redirect/ns9/named.conf.j2
index 11329fd04c8611199a23c5cb9d3acd08c999aadf..7d5e9eb831d0175d27601325eabd3ea849fb704d 100644 (file)
--- a/bin/tests/system/redirect/ns9/named.conf.j2
+++ b/bin/tests/system/redirect/ns9/named.conf.j2
@@ -2,13 +2,7 @@
 // (synth-from-dnssec path)
 
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/resend_loop/ns1/named.conf.j2 b/bin/tests/system/resend_loop/ns1/named.conf.j2
index 2ca78bca60c953e4f7f4d846da0d1537de3df3cc..09c9069f5f35345d2d95b1afe0ffa2e383cfa21b 100644 (file)
--- a/bin/tests/system/resend_loop/ns1/named.conf.j2
+++ b/bin/tests/system/resend_loop/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-query { any; };
        forwarders { 10.53.0.3 port @PORT@; };
        forward only;

diff --git a/bin/tests/system/resend_loop/ns4/named.conf.j2 b/bin/tests/system/resend_loop/ns4/named.conf.j2
index 873c4a39514300fa5f518dad441203672ca27407..cc8c54320e6c6fc1ca63c0a698f8729ec15aa372 100644 (file)
--- a/bin/tests/system/resend_loop/ns4/named.conf.j2
+++ b/bin/tests/system/resend_loop/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        query-source-v6 none;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/resolver/ns1/named.conf.j2 b/bin/tests/system/resolver/ns1/named.conf.j2
index 734f2d4da5c68a62ac8e1822b7bcbfcfacb1cac3..4d154401c3add6eeb22a043291477a316c428005 100644 (file)
--- a/bin/tests/system/resolver/ns1/named.conf.j2
+++ b/bin/tests/system/resolver/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; }
                 except-from { "example.org"; };

diff --git a/bin/tests/system/resolver/ns1/named2.conf.j2 b/bin/tests/system/resolver/ns1/named2.conf.j2
index ccc6c1bf5648e7c5900f9244be2bd971d04e6057..b2d5b677b522dc036b6e10a630cfa9c06763d8fb 100644 (file)
--- a/bin/tests/system/resolver/ns1/named2.conf.j2
+++ b/bin/tests/system/resolver/ns1/named2.conf.j2
@@ -1,13 +1,7 @@
 {% set wrongoption = wrongoption | default(False) %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        attach-cache "globalcache";
         max-zone-ttl unlimited;

diff --git a/bin/tests/system/resolver/ns11/named.conf.j2 b/bin/tests/system/resolver/ns11/named.conf.j2
index ccccce2ba03f5487c1e8a1a9cd8b8bc87209668e..7be9c72cc8106672031456b6504e3d8c74f91544 100644 (file)
--- a/bin/tests/system/resolver/ns11/named.conf.j2
+++ b/bin/tests/system/resolver/ns11/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.11;
-       notify-source 10.53.0.11;
-       transfer-source 10.53.0.11;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.11; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-any no;

diff --git a/bin/tests/system/resolver/ns4/named.conf.j2 b/bin/tests/system/resolver/ns4/named.conf.j2
index 29933d7f6947547de9f1321907c3e10557831839..1ccf4b20d9a97258fa6d7176be784e7672167896 100644 (file)
--- a/bin/tests/system/resolver/ns4/named.conf.j2
+++ b/bin/tests/system/resolver/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-any no;

diff --git a/bin/tests/system/resolver/ns5/named.conf.j2 b/bin/tests/system/resolver/ns5/named.conf.j2
index 854f27b4fd95dd467a12ba58daa1d947e1b0f9d2..7a49c2e431a972939847bb1a5a15d5365b8cef59 100644 (file)
--- a/bin/tests/system/resolver/ns5/named.conf.j2
+++ b/bin/tests/system/resolver/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        querylog yes;
        prefetch 4 10;

diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2
index 11c80492980bd71b9836f7439153773230bedc4c..0c467e63d01bddafbf1eaf61129949dd8b9b4bf6 100644 (file)
--- a/bin/tests/system/rndc/ns2/named.conf.j2
+++ b/bin/tests/system/rndc/ns2/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/rndc/ns3/named.conf.j2 b/bin/tests/system/rndc/ns3/named.conf.j2
index e54733d9599ca1370d8ef1e727f020f55476a222..ee725b83a6aecf87533c4663a62fb853b3d9a2df 100644 (file)
--- a/bin/tests/system/rndc/ns3/named.conf.j2
+++ b/bin/tests/system/rndc/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/rndc/ns4/named.conf.j2 b/bin/tests/system/rndc/ns4/named.conf.j2
index d1bee45bece7c06c195040af79b73c6a54244923..ecbe49bc00e5f85291d70111626fb106cee5ae20 100644 (file)
--- a/bin/tests/system/rndc/ns4/named.conf.j2
+++ b/bin/tests/system/rndc/ns4/named.conf.j2
@@ -1,12 +1,6 @@
 /* deliberately not _common/controls.conf.j2: setup.sh appends a runtime-generated multi-key channel on EXTRAPORT7 */
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2
index a65f3f8bc39c3eebe575fd91b38427805c9c93f6..435453eec40cab10a14551209a75f153b2b09a9b 100644 (file)
--- a/bin/tests/system/rndc/ns5/named.conf.j2
+++ b/bin/tests/system/rndc/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/rndc/ns6/named.conf.j2 b/bin/tests/system/rndc/ns6/named.conf.j2
index 21f62ff31db7d1f37cb395f4248c0f7ac74a5b32..9669d811419178954aad140509fbff43b28e539c 100644 (file)
--- a/bin/tests/system/rndc/ns6/named.conf.j2
+++ b/bin/tests/system/rndc/ns6/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/rndc/ns7/named.conf.j2 b/bin/tests/system/rndc/ns7/named.conf.j2
index be7984e34307bbec141a5b211fcba22c7c185efd..5e9bbfa632d494ad16ae7a15c390d078131a2f9e 100644 (file)
--- a/bin/tests/system/rndc/ns7/named.conf.j2
+++ b/bin/tests/system/rndc/ns7/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/rollover/ns1/named.conf.j2 b/bin/tests/system/rollover/ns1/named.conf.j2
index f50e6320928addb2dd05b8e9cb34045c5129394b..e6d08533f4f7f6cf5c0dfc928c48ce677ec31524 100644 (file)
--- a/bin/tests/system/rollover/ns1/named.conf.j2
+++ b/bin/tests/system/rollover/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/rollover/ns2/named.conf.j2 b/bin/tests/system/rollover/ns2/named.conf.j2
index 009f1b9c487e926298b2d7f2adf4cbf0fbc80a6f..45d16d1f3661a1c778c1ebc59c2017e1f1fce12e 100644 (file)
--- a/bin/tests/system/rollover/ns2/named.conf.j2
+++ b/bin/tests/system/rollover/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        allow-notify { 10.53.0.3; };
        recursion no;

diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2
index 6d06280562dcff268a4c8afdc51ca014865d38ac..f94c07d81adb440305ef97b4a8d59ad2d406680d 100644 (file)
--- a/bin/tests/system/rollover/ns3/named.common.conf.j2
+++ b/bin/tests/system/rollover/ns3/named.common.conf.j2
@@ -7,13 +7,7 @@ include "trusted.conf";
 
 
 options {
-        query-source address 10.53.0.3;
-        notify-source 10.53.0.3;
-        transfer-source 10.53.0.3;
-        port @PORT@;
-        pid-file "named.pid";
-        listen-on { 10.53.0.3; };
-        listen-on-v6 { none; };
+        {% include_indented "_common/options.conf.j2" %}
         allow-transfer { any; };
         dnssec-validation @dnssec_validation@;
         notify-cfg CDS { notify yes; };

diff --git a/bin/tests/system/rollover/ns4/named.common.conf.j2 b/bin/tests/system/rollover/ns4/named.common.conf.j2
index 5fac1717c21c0c6e77757783c65a1958112ea7a7..e744591d323b719f1aac24da7e75709f12264065 100644 (file)
--- a/bin/tests/system/rollover/ns4/named.common.conf.j2
+++ b/bin/tests/system/rollover/ns4/named.common.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-        query-source address 10.53.0.4;
-        notify-source 10.53.0.4;
-        transfer-source 10.53.0.4;
-        port @PORT@;
-        pid-file "named.pid";
-        listen-on { 10.53.0.4; };
-        listen-on-v6 { none; };
+        {% include_indented "_common/options.conf.j2" %}
         allow-transfer { any; };
         recursion no;
         dnssec-validation no;

diff --git a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2
index 647a42d8b7c5cec1dad8cd51739909bc75657891..4dcda49386c343abc6b683c33ed75ae0e013ab73 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns1/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2
index d6cc29764be0792951a128e2a56f490e7e5dc0bf..894616e87dd055c8a54af4918791d800cfb1660a 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns2/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2
index d1819558a3ee04203471b868cef248a44e7444d1..10485eeb0c03c895aa67860b7562ffacbfb4c276 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns3/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        root-key-sentinel yes;
 };

diff --git a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2 b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2
index bb3cf6fa678c13955fa5b86637d29dd18892cb39..42d3852ac89f340de3234966d6fc4044af2b871a 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns4/named.conf.j2
+++ b/bin/tests/system/rootkeysentinel/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        root-key-sentinel no;
 };

diff --git a/bin/tests/system/rpz/ns1/named.conf.j2 b/bin/tests/system/rpz/ns1/named.conf.j2
index 332dfd5e87e8f0f35a616f14ce5c0ed2a75c6cf2..47fd660e0ed7c8a8b7bd70f77a3d88407da68a5c 100644 (file)
--- a/bin/tests/system/rpz/ns1/named.conf.j2
+++ b/bin/tests/system/rpz/ns1/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        notify no;
        minimal-any no;

diff --git a/bin/tests/system/rpz/ns10/named.conf.j2 b/bin/tests/system/rpz/ns10/named.conf.j2
index 2797e5e1380539b716231f9348b1da9ed6496120..f58181b16526a8688fc4ff5a41a0625393269588 100644 (file)
--- a/bin/tests/system/rpz/ns10/named.conf.j2
+++ b/bin/tests/system/rpz/ns10/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.10;
-       notify-source 10.53.0.10;
-       transfer-source 10.53.0.10;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.10; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        notify no;
        minimal-any no;

diff --git a/bin/tests/system/rpz/ns2/named.conf.j2 b/bin/tests/system/rpz/ns2/named.conf.j2
index 54d95c6cbacbbebd05025fc02a21f0e371d2d49e..1bb33e9d630881225837ecc197941adb7e2f98aa 100644 (file)
--- a/bin/tests/system/rpz/ns2/named.conf.j2
+++ b/bin/tests/system/rpz/ns2/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        notify no;
        minimal-any no;

diff --git a/bin/tests/system/rpz/ns3/named.conf.j2 b/bin/tests/system/rpz/ns3/named.conf.j2
index 028c75f67a897ec8d55e263308df5a837bc00ea4..fce1fde48a98d5265f96a31770a32983bca87d00 100644 (file)
--- a/bin/tests/system/rpz/ns3/named.conf.j2
+++ b/bin/tests/system/rpz/ns3/named.conf.j2
@@ -5,15 +5,9 @@
 {% set bad_dlz = bad_dlz | default(False) %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        session-keyfile "session.key";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        minimal-any no;
        minimal-responses no;

diff --git a/bin/tests/system/rpz/ns4/named.conf.j2 b/bin/tests/system/rpz/ns4/named.conf.j2
index 29e7e259262c2170ae0606c729567f54a0a6f129..783bac8b7e57a7618a69e69b1d0c16ee8c961635 100644 (file)
--- a/bin/tests/system/rpz/ns4/named.conf.j2
+++ b/bin/tests/system/rpz/ns4/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        notify no;
        minimal-any no;

diff --git a/bin/tests/system/rpz/ns5/named.conf.j2 b/bin/tests/system/rpz/ns5/named.conf.j2
index 0270ec31d3c2bdaf334aaecceddead4a9c57568a..2811e4be4e750b672d6a0f43987a24e2b9bad35c 100644 (file)
--- a/bin/tests/system/rpz/ns5/named.conf.j2
+++ b/bin/tests/system/rpz/ns5/named.conf.j2
@@ -3,15 +3,9 @@
  */
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        session-keyfile "session.key";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        ixfr-from-differences yes;
        notify-delay 0;

diff --git a/bin/tests/system/rpz/ns6/named.conf.j2 b/bin/tests/system/rpz/ns6/named.conf.j2
index a40145f9113d3af290d91eec58ddf82f94dee3b9..6181f9eea70db2c6011da2b8d873f36c407fa4ef 100644 (file)
--- a/bin/tests/system/rpz/ns6/named.conf.j2
+++ b/bin/tests/system/rpz/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        session-keyfile "session.key";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        forward only;
        forwarders { 10.53.0.3; };

diff --git a/bin/tests/system/rpz/ns7/named.conf.j2 b/bin/tests/system/rpz/ns7/named.conf.j2
index 0af33eb576402e2745fb74524e15790a69860fde..76fc0ed6445a392200c39aa44c8dbd8b823716f6 100644 (file)
--- a/bin/tests/system/rpz/ns7/named.conf.j2
+++ b/bin/tests/system/rpz/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        session-keyfile "session.key";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        minimal-any no;
        minimal-responses no;

diff --git a/bin/tests/system/rpz/ns8/named.conf.j2 b/bin/tests/system/rpz/ns8/named.conf.j2
index 832ddba12caf57fcf484575886d91bf9ecb7db19..2afbb0adb8344fdf7c890c503f46ba95b3339dc3 100644 (file)
--- a/bin/tests/system/rpz/ns8/named.conf.j2
+++ b/bin/tests/system/rpz/ns8/named.conf.j2
@@ -3,15 +3,9 @@
  */
 
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        session-keyfile "session.key";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        minimal-any no;
        minimal-responses no;

diff --git a/bin/tests/system/rpz/ns9/named.conf.j2 b/bin/tests/system/rpz/ns9/named.conf.j2
index ffa402bb3873844f8de69484cfe54a1c9f1b0421..290c5cd985a6153e98a19c3a2e72291f0bc98977 100644 (file)
--- a/bin/tests/system/rpz/ns9/named.conf.j2
+++ b/bin/tests/system/rpz/ns9/named.conf.j2
@@ -3,15 +3,9 @@
  */
 
 options {
-       query-source address 10.53.0.9;
-       notify-source 10.53.0.9;
-       transfer-source 10.53.0.9;
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        statistics-file "named.stats";
        session-keyfile "session.key";
-       listen-on { 10.53.0.9; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        minimal-any no;
        minimal-responses no;

diff --git a/bin/tests/system/rpzextra/ns2/named.conf.j2 b/bin/tests/system/rpzextra/ns2/named.conf.j2
index f7ba0ec61834e7d26360cfd7baeb231260b0f6a6..4865db6702503654b501d4ee628be3ff3e2f8ae5 100644 (file)
--- a/bin/tests/system/rpzextra/ns2/named.conf.j2
+++ b/bin/tests/system/rpzextra/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
        allow-query { any; };

diff --git a/bin/tests/system/rpzextra/ns3/named.conf.j2 b/bin/tests/system/rpzextra/ns3/named.conf.j2
index 7c240c8c27ede8a3b410f70092ae6edbcfb124f2..c29ac72b6a824c5d3dbf4c5de27fcdf9e3e8bbc8 100644 (file)
--- a/bin/tests/system/rpzextra/ns3/named.conf.j2
+++ b/bin/tests/system/rpzextra/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
        allow-query { any; };

diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.j2 b/bin/tests/system/rpzrecurse/ns1/named.conf.j2
index c839fe4f97e3735f6e87d3465c5bba08bf4cf654..c2209814c03a2e81bd923e7c6994fa8cdffbe51d 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns1/named.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
        querylog yes;

diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2
index 7fa20f4c95c0ff660d60be765fc7bd533be7cdd1..d19591e305bb8d12807d5202cd7afe5cfcf82db0 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        dnssec-validation no;
        querylog yes;
 };

diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
index 9a100c8b0698ed7eb147d2155d5f61c60fd0242a..da5e8b2748c4ef21d2e9dcccd4935220e0124af5 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
@@ -1,14 +1,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
        dnssec-validation no;
        response-policy { zone "policy"; }
                qname-wait-recurse yes

diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
index 6259bb72c5f417fe3823efaee8a4886049bbe589..d2319a6e175c36f09522b9364e1c68ad6ff3d203 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        response-policy { zone "policy"; }
                 nsip-wait-recurse no

diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
index 8a5362c3698d2abdd28615a6b60c1a51400103c9..6b7386ca3c1dd38be31415c28cb6a1f21636c5f1 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        response-policy { zone "policy"; }
                 nsip-wait-recurse no

diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.j2 b/bin/tests/system/rpzrecurse/ns4/named.conf.j2
index 611e07d5407cf5a815cc57de8ebc883bd66dc55d..7ff18a7edf3a2ba80c55de7ea4affe5c7e433f4e 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns4/named.conf.j2
+++ b/bin/tests/system/rpzrecurse/ns4/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/rrl/ns1/named.conf.j2 b/bin/tests/system/rrl/ns1/named.conf.j2
index 31c2dbdfa95009a55f56b4fb1ff5fad91f4436c6..cadd63e8428fe7f8f97e66cea195f1d82f6929d9 100644 (file)
--- a/bin/tests/system/rrl/ns1/named.conf.j2
+++ b/bin/tests/system/rrl/ns1/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
        notify no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/rrl/ns2/named.conf.j2 b/bin/tests/system/rrl/ns2/named.conf.j2
index c090827648016d7f48d77f2878adf45d14082fb9..07514eb48f6d9ce972507a7279744a359d21758d 100644 (file)
--- a/bin/tests/system/rrl/ns2/named.conf.j2
+++ b/bin/tests/system/rrl/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
        statistics-file "named.stats";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        notify no;
        dnssec-validation no;
 

diff --git a/bin/tests/system/rrl/ns3/named.conf.j2 b/bin/tests/system/rrl/ns3/named.conf.j2
index 83406aa02c4d3b2bea9d38b398739f2ad67a8533..d9dfd9a9702a7b44185baf6a3e1bb40c9d3092d0 100644 (file)
--- a/bin/tests/system/rrl/ns3/named.conf.j2
+++ b/bin/tests/system/rrl/ns3/named.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
        notify no;
        dnssec-validation no;
 

diff --git a/bin/tests/system/rrl/ns4/named.conf.j2 b/bin/tests/system/rrl/ns4/named.conf.j2
index 5b50e9b9ea13ed9b463f280ce33436594ee86698..d079744e8e6df05683cd49bf5b04c1ea9df90531 100644 (file)
--- a/bin/tests/system/rrl/ns4/named.conf.j2
+++ b/bin/tests/system/rrl/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        session-keyfile "session.key";
-       pid-file "named.pid";
        statistics-file "named.stats";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
        notify no;
        dnssec-validation no;
        max-udp-size 4096;

diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.j2 b/bin/tests/system/rrsetorder/ns1/named.conf.j2
index f200b44eeb78731bfd0f877ef23a4e10856ebe70..a40ea857f4a9ef24b865cd4082775e3146a6d0ba 100644 (file)
--- a/bin/tests/system/rrsetorder/ns1/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.j2 b/bin/tests/system/rrsetorder/ns2/named.conf.j2
index 547cc74b777bb51ebbcdda80ea2065b080fba137..0798861dd49595f31736e1e78d79c526cac9de88 100644 (file)
--- a/bin/tests/system/rrsetorder/ns2/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        rrset-order {

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2
index 2cd32dcff7b1fc3bcaf059f65c03bc67959a1092..e1053301918ee154b995cc4aca2a0d7ae8ab0248 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        rrset-order {
                name "random.example" order random;

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2
index ba6aec78d96144992425ca6788f278b81e049a8a..636fbed1564739e6b1cb3f2b1739ce8115ea9e0f 100644 (file)
--- a/bin/tests/system/rrsetorder/ns4/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        rrset-order {
                class IN type A name "host.example.com" order random;

diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.j2 b/bin/tests/system/rrsetorder/ns5/named.conf.j2
index 1a20346ff86c6d3f92aec936d84b73885ac8f858..1aff3cc702214c97bf70d40dc82cdc580fe542ec 100644 (file)
--- a/bin/tests/system/rrsetorder/ns5/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/rrsig/ns1/named.conf.j2 b/bin/tests/system/rrsig/ns1/named.conf.j2
index 8e467c3ff1945d86c43576e83b1ff8ff0e28eb20..2c5f8bd720a30569d4f050b1ae7f27503371c0b7 100644 (file)
--- a/bin/tests/system/rrsig/ns1/named.conf.j2
+++ b/bin/tests/system/rrsig/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       transfer-source 10.53.0.1;
-       notify-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        notify explicit;

diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.j2 b/bin/tests/system/rsabigexponent/ns1/named.conf.j2
index 574e74486e3f41ec3b88f20a287fadfa14d3b1af..e210bdddb3373279e6fcf605a8a6ce4957423b54 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.j2
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
index a277ea34fe5bc834eb3740d27ccb27cd892c1498..92abbc1c29ee563ad88c860b76fca563cb1e2e0c 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.j2
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/runtime/ns2/named2.conf.j2 b/bin/tests/system/runtime/ns2/named2.conf.j2
index 69e168afbec4c6ea6f4c834be5edcd400d97200f..9cf0971fb4c7efa9b8d02e00caf548b2ec6fa9b7 100644 (file)
--- a/bin/tests/system/runtime/ns2/named2.conf.j2
+++ b/bin/tests/system/runtime/ns2/named2.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
+       {% include_indented "_common/options.conf.j2" %}
        directory "./nope";
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/runtime/ns2/named3.conf.j2 b/bin/tests/system/runtime/ns2/named3.conf.j2
index ddc374b3d4e9867f8e7b1e21ef334a836126d932..11e5fc4ea56973cd60d14647acaa3c401f703ae3 100644 (file)
--- a/bin/tests/system/runtime/ns2/named3.conf.j2
+++ b/bin/tests/system/runtime/ns2/named3.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
+       {% include_indented "_common/options.conf.j2" %}
        managed-keys-directory "./nope";
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/runtime/ns2/named4.conf.j2 b/bin/tests/system/runtime/ns2/named4.conf.j2
index b768f62d5261a5ed00cc04a36de3f727251cfdec..36822fbdcc8911e6277e3119ebe8875c1d409c8f 100644 (file)
--- a/bin/tests/system/runtime/ns2/named4.conf.j2
+++ b/bin/tests/system/runtime/ns2/named4.conf.j2
@@ -1,12 +1,6 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
+       {% include_indented "_common/options.conf.j2" %}
        new-zones-directory "./nope";
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/selfpointedglue/ns1/named.conf.j2 b/bin/tests/system/selfpointedglue/ns1/named.conf.j2
index a14fedbb4e7d6ae691c57fdced63af890cccc1c1..3175cc6c78fc8f137a7f7b01028d9591e3678475 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns1/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns1/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/selfpointedglue/ns2/named.conf.j2 b/bin/tests/system/selfpointedglue/ns2/named.conf.j2
index 3ee7077ea0784752078ddbf272de51629e8b1c49..a2b6b2867321bdb1f22e295b7857076acd23e4e1 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns2/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns2/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/selfpointedglue/ns4/named.conf.j2 b/bin/tests/system/selfpointedglue/ns4/named.conf.j2
index 306425dd685ffefb6dac60a76a57393439255dd6..b1e285930c0c81052ad131f7f13b39dd94d1036a 100644 (file)
--- a/bin/tests/system/selfpointedglue/ns4/named.conf.j2
+++ b/bin/tests/system/selfpointedglue/ns4/named.conf.j2
@@ -13,13 +13,7 @@
 {% set maxdelegationservers = maxdelegationservers | default(None) %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dnstap { resolver query; };
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/serve_stale/ns1/named.conf.j2 b/bin/tests/system/serve_stale/ns1/named.conf.j2
index 2463cb7b6dacf84cbded58b130c14d004a7eee7b..cc6317f0e44e3c89462961f9250f77b9cd1767e6 100644 (file)
--- a/bin/tests/system/serve_stale/ns1/named.conf.j2
+++ b/bin/tests/system/serve_stale/ns1/named.conf.j2
@@ -6,13 +6,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
        max-stale-ttl @max_stale_ttl@;

diff --git a/bin/tests/system/serve_stale/ns3/named.conf.j2 b/bin/tests/system/serve_stale/ns3/named.conf.j2
index 43a3eb60c71359b30c38de39cea768f9440c1579..dcd17ea87f76f4961a5e28db06b7c210dc946fd9 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        qname-minimization off;
        prefetch 0;

diff --git a/bin/tests/system/serve_stale/ns3/named1.conf.j2 b/bin/tests/system/serve_stale/ns3/named1.conf.j2
index c39143bc2a3e9ffbd156c96224a72a8cf46dd3d8..81f7e0b998f54c21af869a258ebe71aef6bc53ca 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named1.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named1.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dump-file "named_dump3.db";
        stale-cache-enable yes;
        dnssec-validation no;

diff --git a/bin/tests/system/serve_stale/ns3/named2.conf.j2 b/bin/tests/system/serve_stale/ns3/named2.conf.j2
index f882eb106dafed90476ebc97164de3a41d05f92a..be056e786b682864d34f452ccc4c476012f48c7f 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named2.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named2.conf.j2
@@ -5,13 +5,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns3/named3.conf.j2 b/bin/tests/system/serve_stale/ns3/named3.conf.j2
index 7552593551a80caa20f322478da6748fc8ef9a1b..04d13ec4fbe53759458b29ecbca14e24e16c0f5f 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named3.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named3.conf.j2
@@ -5,13 +5,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns3/named4.conf.j2 b/bin/tests/system/serve_stale/ns3/named4.conf.j2
index f42792dbfc6dd830268a0d1dc60af67355b83c6a..72e34a01b06eecc309e33394c5ba9b17e02d7c35 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named4.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named4.conf.j2
@@ -5,13 +5,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns3/named5.conf.j2 b/bin/tests/system/serve_stale/ns3/named5.conf.j2
index 8f1d8673dc5aa77f1b23fa45ca765db0876625af..df42711d83b490934809a324a81b3ab9440bccf6 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named5.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named5.conf.j2
@@ -5,13 +5,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns3/named6.conf.j2 b/bin/tests/system/serve_stale/ns3/named6.conf.j2
index 16285995d5bdbbdd42a220aa5c217b7474222cb7..494ad2fb30f2491960f313ad81302789a9af4098 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named6.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named6.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable no;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns3/named7.conf.j2 b/bin/tests/system/serve_stale/ns3/named7.conf.j2
index b39bcc6e2e2b3b5ebc133b86da6fd258679cd4dd..edfa2a4e236ff693aae3f6eaf9954ff6689acea7 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named7.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named7.conf.j2
@@ -5,13 +5,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        /*
         * stale-answer-enable is not strictly required because serving

diff --git a/bin/tests/system/serve_stale/ns3/named8.conf.j2 b/bin/tests/system/serve_stale/ns3/named8.conf.j2
index 4e5b6b79b217771e4771930c9fef6eab6a10b020..457a6f75377b01452aaafe5e393dfad74b355b45 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named8.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named8.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns3/named9.conf.j2 b/bin/tests/system/serve_stale/ns3/named9.conf.j2
index 05bab5cf6cf2d74e0f2dcf41aa4ab1adf7f364c9..78b4b15122f86c1a10c8b7c3db9ea460ac02bb6f 100644 (file)
--- a/bin/tests/system/serve_stale/ns3/named9.conf.j2
+++ b/bin/tests/system/serve_stale/ns3/named9.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        stale-answer-enable yes;
        stale-cache-enable yes;

diff --git a/bin/tests/system/serve_stale/ns4/named.conf.j2 b/bin/tests/system/serve_stale/ns4/named.conf.j2
index f0be8fd6b8646d6c6b9ab4bcf36ad031a2a8589a..fff360c22fd8ba2c47033279740bcb4a212bd72b 100644 (file)
--- a/bin/tests/system/serve_stale/ns4/named.conf.j2
+++ b/bin/tests/system/serve_stale/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dump-file "named_dump.db";
        stale-answer-enable no;

diff --git a/bin/tests/system/serve_stale/ns5/named.conf.j2 b/bin/tests/system/serve_stale/ns5/named.conf.j2
index 953e8d6382da815d5c65dcf57f9d0e26ecd43211..40c5e1b95fe568aa3f55fde92bc5d8e9ae1375ad 100644 (file)
--- a/bin/tests/system/serve_stale/ns5/named.conf.j2
+++ b/bin/tests/system/serve_stale/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dump-file "named_dump.db";
        stale-answer-enable yes;

diff --git a/bin/tests/system/serve_stale/ns6/named.conf.j2 b/bin/tests/system/serve_stale/ns6/named.conf.j2
index dd38d18d14f5e80dcfacc7e678b9231980a142ea..896637f508ee372bf1f0861d02442ce8498c9999 100644 (file)
--- a/bin/tests/system/serve_stale/ns6/named.conf.j2
+++ b/bin/tests/system/serve_stale/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        recursion no;
 };

diff --git a/bin/tests/system/serve_stale/ns7/named.conf.j2 b/bin/tests/system/serve_stale/ns7/named.conf.j2
index a5fdbff336efa59c9e2e66fde9a12a8e55d0c641..91963d341e22b5939e9e6cd9c1e6e4ea9a42616b 100644 (file)
--- a/bin/tests/system/serve_stale/ns7/named.conf.j2
+++ b/bin/tests/system/serve_stale/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        qname-minimization off;
 

diff --git a/bin/tests/system/serve_stale/ns7/named1.conf.j2 b/bin/tests/system/serve_stale/ns7/named1.conf.j2
index 96cd2fec2059f59a9b2091011e473f05007858b2..9136510534f9f56424f3551b2468b486dc1d272d 100644 (file)
--- a/bin/tests/system/serve_stale/ns7/named1.conf.j2
+++ b/bin/tests/system/serve_stale/ns7/named1.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        qname-minimization off;
 

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 d3ad87ac46e4115ab4ff4c3474b1e473d1bfd454..18fc3482f8859aef36c9e533ec732f7c8bd31aa9 100644 (file)
--- a/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2
+++ b/bin/tests/system/serve_stale_tcp/ns1/named.conf.j2
@@ -14,14 +14,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
 
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
 
        recursion no;
        dnssec-validation no;

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 c616e9b035de72b49f534a6971850ebca6e38375..5a0b7a8e63850cf2b167f3212fd1148983f2f548 100644 (file)
--- a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
+++ b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
@@ -14,14 +14,8 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       port @PORT@;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
 
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
 
        dnssec-validation no;
        qname-minimization off;

diff --git a/bin/tests/system/sfcache/ns1/named.conf.j2 b/bin/tests/system/sfcache/ns1/named.conf.j2
index 574e74486e3f41ec3b88f20a287fadfa14d3b1af..e210bdddb3373279e6fcf605a8a6ce4957423b54 100644 (file)
--- a/bin/tests/system/sfcache/ns1/named.conf.j2
+++ b/bin/tests/system/sfcache/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/sfcache/ns2/named.conf.j2 b/bin/tests/system/sfcache/ns2/named.conf.j2
index 981015fa8fa5c2b1c34421ce0925f31ba34d74e3..e24808b1fac8c2eae9f52fd8ad2406efbcbb3707 100644 (file)
--- a/bin/tests/system/sfcache/ns2/named.conf.j2
+++ b/bin/tests/system/sfcache/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/sfcache/ns5/named.conf.j2 b/bin/tests/system/sfcache/ns5/named.conf.j2
index 470266661a72dc14a2d71236e609d754e3a73a57..96b98f138a87060b86318fdd17857934e75c104e 100644 (file)
--- a/bin/tests/system/sfcache/ns5/named.conf.j2
+++ b/bin/tests/system/sfcache/ns5/named.conf.j2
@@ -3,13 +3,7 @@
 {% set servfail_ttl = servfail_ttl | default(30) %}
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        servfail-ttl @servfail_ttl@;
 };

diff --git a/bin/tests/system/sfcache_cname/ns1/named.conf.j2 b/bin/tests/system/sfcache_cname/ns1/named.conf.j2
index 88617a89c699b770f5fe8535ffeac20bf581bf62..a1bf2d087e0c5f80f2e99a07ec71bec225875d7e 100644 (file)
--- a/bin/tests/system/sfcache_cname/ns1/named.conf.j2
+++ b/bin/tests/system/sfcache_cname/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-    query-source address @ns.ip@;
-    notify-source @ns.ip@;
-    transfer-source @ns.ip@;
-    port @PORT@;
-    pid-file "named.pid";
-    listen-on { @ns.ip@; };
-    listen-on-v6 { none; };
+    {% include_indented "_common/options.conf.j2" %}
     recursion no;
     dnssec-validation no;
 };

diff --git a/bin/tests/system/sfcache_cname/ns2/named.conf.j2 b/bin/tests/system/sfcache_cname/ns2/named.conf.j2
index 72e239c2ec599b6a9516894caddf6694f778d5ae..787472cf806a4a3d044e50c3e33a33bb1b6e8eb0 100644 (file)
--- a/bin/tests/system/sfcache_cname/ns2/named.conf.j2
+++ b/bin/tests/system/sfcache_cname/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       query-source address @ns.ip@;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { @ns.ip@; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        qname-minimization off;
        servfail-ttl 5;

diff --git a/bin/tests/system/showconf/ns1/named.conf.j2 b/bin/tests/system/showconf/ns1/named.conf.j2
index 0ff6b9658d905cb8cf03e6dd8b3b4d41168ec962..a21e0861abcc3b0bc8c2b8fb35818651712f6f56 100644 (file)
--- a/bin/tests/system/showconf/ns1/named.conf.j2
+++ b/bin/tests/system/showconf/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-responses no;

diff --git a/bin/tests/system/shutdown/ns1/named.conf.j2 b/bin/tests/system/shutdown/ns1/named.conf.j2
index 456c8d9100254ed39e9af9689bbe8cabbf99d924..2fcde778c8d1944d46dcdbdd531994ad3478c39b 100644 (file)
--- a/bin/tests/system/shutdown/ns1/named.conf.j2
+++ b/bin/tests/system/shutdown/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
        allow-query { any; };

diff --git a/bin/tests/system/shutdown/ns2/named.conf.j2 b/bin/tests/system/shutdown/ns2/named.conf.j2
index dcc6824fe34885ac6ddf31dac55a78e9a43ed024..2380f02228a7dbd47ede7f4b08e121db22df0c3a 100644 (file)
--- a/bin/tests/system/shutdown/ns2/named.conf.j2
+++ b/bin/tests/system/shutdown/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
        allow-query { any; };

diff --git a/bin/tests/system/sig0/ns1/named.conf.j2 b/bin/tests/system/sig0/ns1/named.conf.j2
index 5a1407869720c2f35db82ef484bb5727edfdcf89..dad31fe3122170ad5cc78aad3d6cf858690c45a1 100644 (file)
--- a/bin/tests/system/sig0/ns1/named.conf.j2
+++ b/bin/tests/system/sig0/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        notify no;
 };

diff --git a/bin/tests/system/spf/ns1/named.conf.j2 b/bin/tests/system/spf/ns1/named.conf.j2
index ce17ddc43bbd36bd7a7f6ddf914bf83bae790e36..42123aa7f84bb98eb001325c6ceadbc71081bc5e 100644 (file)
--- a/bin/tests/system/spf/ns1/named.conf.j2
+++ b/bin/tests/system/spf/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        ixfr-from-differences yes;

diff --git a/bin/tests/system/srtt/ns1/named.conf.j2 b/bin/tests/system/srtt/ns1/named.conf.j2
index 0135d55f12bb2dda5b18d365df45fd4cf23dcb16..9347c636084c020f56d2c540c767cfd0ee7083dc 100644 (file)
--- a/bin/tests/system/srtt/ns1/named.conf.j2
+++ b/bin/tests/system/srtt/ns1/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/srtt/ns6/named.conf.j2 b/bin/tests/system/srtt/ns6/named.conf.j2
index b982f371196dcde56d8b292ece774c1e899ba11d..cd4b2b8f6ee4f50a9c610ae51fc84215d1f75cdf 100644 (file)
--- a/bin/tests/system/srtt/ns6/named.conf.j2
+++ b/bin/tests/system/srtt/ns6/named.conf.j2
@@ -13,13 +13,7 @@
 
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        dnstap { resolver query; };
        dnstap-output file "dnstap.out";

diff --git a/bin/tests/system/ssumaxtype/ns1/named.conf.j2 b/bin/tests/system/ssumaxtype/ns1/named.conf.j2
index dc3e5351fb00a19d790acb1677a39a74094e8a72..6572d69accfb2709030488a2be46ffc72a7c2e4f 100644 (file)
--- a/bin/tests/system/ssumaxtype/ns1/named.conf.j2
+++ b/bin/tests/system/ssumaxtype/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/ssutoctou/ns1/named.conf.j2 b/bin/tests/system/ssutoctou/ns1/named.conf.j2
index 5a5177739343bd1968aa9a630aef508d6a5013bd..cf78e753a5868aa9658bed2d3397ce0cac6c2124 100644 (file)
--- a/bin/tests/system/ssutoctou/ns1/named.conf.j2
+++ b/bin/tests/system/ssutoctou/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% set use_ssu = use_ssu | default(False) %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/staticstub/ns1/named.conf.j2 b/bin/tests/system/staticstub/ns1/named.conf.j2
index 2e1d7efe6ec58949a591d40d373d4d50311a2ccc..35dde54bebff50f06c60fa74153c07812c62eea6 100644 (file)
--- a/bin/tests/system/staticstub/ns1/named.conf.j2
+++ b/bin/tests/system/staticstub/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       query-source address 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/staticstub/ns2/named.conf.j2 b/bin/tests/system/staticstub/ns2/named.conf.j2
index 514643255affa56833c8e61296bbdd715f82e048..2d0386db044dd1095c37a36126a346fb8a48936f 100644 (file)
--- a/bin/tests/system/staticstub/ns2/named.conf.j2
+++ b/bin/tests/system/staticstub/ns2/named.conf.j2
@@ -5,13 +5,7 @@
 include "trusted.conf";
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        notify no;
        minimal-responses no;

diff --git a/bin/tests/system/staticstub/ns3/named.conf.j2 b/bin/tests/system/staticstub/ns3/named.conf.j2
index 4c29d12832903c90eb552429add8fc8dd499743b..2e0046835c03f635843c9b15abbeaf6e29860b7f 100644 (file)
--- a/bin/tests/system/staticstub/ns3/named.conf.j2
+++ b/bin/tests/system/staticstub/ns3/named.conf.j2
@@ -3,13 +3,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/statistics/ns1/named.conf.j2 b/bin/tests/system/statistics/ns1/named.conf.j2
index 942028944ba6cf4129b9472307c2f75096a3703d..3e6444642522a9f5e5542e97c15811d0556ee320 100644 (file)
--- a/bin/tests/system/statistics/ns1/named.conf.j2
+++ b/bin/tests/system/statistics/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2
index 9cebe68a5c1d04cb70235dc7bf2b18c689e8073c..3149b99d66f9ada3e0c5b903d82c5fcb83ab0525 100644 (file)
--- a/bin/tests/system/statistics/ns2/named1.conf.j2
+++ b/bin/tests/system/statistics/ns2/named1.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2
index 6056a1040cac01c1a836074c21cab3b730bbfcc7..6acaab8f34a4daf06a88f79dfb86eb120af54d86 100644 (file)
--- a/bin/tests/system/statistics/ns2/named2.conf.j2
+++ b/bin/tests/system/statistics/ns2/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2
index 219ef08b57871c9a6c67bf035ff51c04f75b2a11..92ea60e215965f9123bf54bf8d8f59967dc40d87 100644 (file)
--- a/bin/tests/system/statistics/ns3/named.conf.j2
+++ b/bin/tests/system/statistics/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        qname-minimization disabled;
        zone-statistics yes;

diff --git a/bin/tests/system/statschannel/ns2/named.conf.j2 b/bin/tests/system/statschannel/ns2/named.conf.j2
index 6bc3bd60c163eab761030d457b1824c09a1938bc..dd0eaf7856de1ce308181b6e11c2382f3711c8cc 100644 (file)
--- a/bin/tests/system/statschannel/ns2/named.conf.j2
+++ b/bin/tests/system/statschannel/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/statschannel/ns2/named2.conf.j2 b/bin/tests/system/statschannel/ns2/named2.conf.j2
index 33265ea77fa16252f1aebb5f092dcbcbaf421567..864c9d00bace3554669a07ba91568429760b4759 100644 (file)
--- a/bin/tests/system/statschannel/ns2/named2.conf.j2
+++ b/bin/tests/system/statschannel/ns2/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/statschannel/ns4/named.conf.j2 b/bin/tests/system/statschannel/ns4/named.conf.j2
index ffc8d8ddfe929808f8a1fbb015dd1c520a39a5c3..e96b1aa90b194ddc73025cd2412af24bfe79e608 100644 (file)
--- a/bin/tests/system/statschannel/ns4/named.conf.j2
+++ b/bin/tests/system/statschannel/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        notify no;
        minimal-responses no;

diff --git a/bin/tests/system/stress/ns2/named.conf.j2 b/bin/tests/system/stress/ns2/named.conf.j2
index 6f11045dc6e81d154c1d1e72ae124f4cad2643ca..95fa103ce3214741445dbeda19e4286e9c0f338e 100644 (file)
--- a/bin/tests/system/stress/ns2/named.conf.j2
+++ b/bin/tests/system/stress/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/stress/ns3/named.conf.j2 b/bin/tests/system/stress/ns3/named.conf.j2
index e0e376c828c771c9bdd22fa9351e2492792d2555..06a8acec8b4850560f5cf305d66709dd9714c0f4 100644 (file)
--- a/bin/tests/system/stress/ns3/named.conf.j2
+++ b/bin/tests/system/stress/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/stress/ns4/named.conf.j2 b/bin/tests/system/stress/ns4/named.conf.j2
index 0b06812e39a09158a75ee3389602f31ecabca1d4..62db6c1f779cfb59e249142ffe83fd025472e51f 100644 (file)
--- a/bin/tests/system/stress/ns4/named.conf.j2
+++ b/bin/tests/system/stress/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/stub/ns1/named.conf.j2 b/bin/tests/system/stub/ns1/named.conf.j2
index d59f79bfbe7ba334e523741d017a578e9e62c704..3cbcc7b21d6218001e5ce4cd65275e43638925d4 100644 (file)
--- a/bin/tests/system/stub/ns1/named.conf.j2
+++ b/bin/tests/system/stub/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-responses no;

diff --git a/bin/tests/system/stub/ns2/named.conf.j2 b/bin/tests/system/stub/ns2/named.conf.j2
index 376ec060035c1861b09809ebcc9bd32db271fa3d..2b5999e2284b5ec84642604fccfd142406db0f1b 100644 (file)
--- a/bin/tests/system/stub/ns2/named.conf.j2
+++ b/bin/tests/system/stub/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        minimal-responses no;

diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2
index e42b318b77999db7eb0d97f369a1c79380119fdf..74274d67c7497e7693b37d53ddea3a19ed149876 100644 (file)
--- a/bin/tests/system/stub/ns3/named.conf.j2
+++ b/bin/tests/system/stub/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        minimal-responses no;
 };

diff --git a/bin/tests/system/stub/ns4/named.conf.j2 b/bin/tests/system/stub/ns4/named.conf.j2
index 181e678a729006802ad41ea63ef9ae95c9dba862..e66e5d3303afe258ec69f73989f9985d5787df91 100644 (file)
--- a/bin/tests/system/stub/ns4/named.conf.j2
+++ b/bin/tests/system/stub/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        minimal-responses yes;
        dnssec-validation no;

diff --git a/bin/tests/system/stub/ns5/named.conf.j2 b/bin/tests/system/stub/ns5/named.conf.j2
index d6ca0448246ef960e45e89da2d2c96b486665335..aeea20d7eeac37cb77868a12dedc7350ad5067e3 100644 (file)
--- a/bin/tests/system/stub/ns5/named.conf.j2
+++ b/bin/tests/system/stub/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2
index 24c1ce2d58cbd14b0a2e885781a0e505f4de4d33..7abd7a4fa386e6184040b95095720a48d944043a 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns1/named.conf.j2
+++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2
index a53ab2240114cf3b232b9d49297ba3ed763b760e..88d94fc25c37759d66815533f8727b35bdbd800f 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns2/named.conf.j2
+++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2
index 166ee1355540af69b468bb610ff1de425bdf0894..1996f3b1caf98a11ad434079ec9207710870dc6b 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns3/named.conf.j2
+++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation yes;
 };

diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2
index dbef1981f3004845bf66997a193bdaee6cc12d50..4aacdb68b3d82d55891728f468f57ab7c7f3f685 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns4/named.conf.j2
+++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2
@@ -1,13 +1,7 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation yes;
        synth-from-dnssec no;

diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2
index 866d9bb1747d8f0715f96ff3c974a374b0755378..df28657201974cded996f74ec0b803f0dcb7280e 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns5/named.conf.j2
+++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2
@@ -1,13 +1,7 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation yes;
        synth-from-dnssec yes;

diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2
index b0b97f48825dc0804a32242d6f6f156593ee6238..b6a427cfff63dab0320025185e71631386dc08ff 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns6/named.conf.j2
+++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        notify no;
        dnssec-validation no;
        synth-from-dnssec yes;

diff --git a/bin/tests/system/tcp/ns1/named.conf.j2 b/bin/tests/system/tcp/ns1/named.conf.j2
index 021594d3f46f962b96912a703be0f82e82ee2225..1972bffc77ded18d3e06bce87f421ac47211a6f6 100644 (file)
--- a/bin/tests/system/tcp/ns1/named.conf.j2
+++ b/bin/tests/system/tcp/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        statistics-file "named.stats";

diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2
index 32853c23a2ccab44bbaae1c666603ab6f14f1e75..b9f21db3e55f11c26bb29ff7e1f0a14e97a963af 100644 (file)
--- a/bin/tests/system/tcp/ns2/named.conf.j2
+++ b/bin/tests/system/tcp/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        statistics-file "named.stats";
 };

diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2
index 08f83dede01295e36a9271a5695a07f93ec22b65..5c6b735e1c7bc8aa6c419545cceefbc50e2ce300 100644 (file)
--- a/bin/tests/system/tcp/ns3/named.conf.j2
+++ b/bin/tests/system/tcp/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2
index 1ed7f483685fbbef180762c07ecaee2bc0ef8aef..953e1c928c5639fee995ed2fbbd726b1fe583545 100644 (file)
--- a/bin/tests/system/tcp/ns4/named.conf.j2
+++ b/bin/tests/system/tcp/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        forwarders { 10.53.0.2; };
        forward only;

diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2
index c8f8e0553bc254a71f5cbd4ef947601309301f2d..e4568b7403e89d855a8e9c58dc093cecb8001a04 100644 (file)
--- a/bin/tests/system/tcp/ns5/named.conf.j2
+++ b/bin/tests/system/tcp/ns5/named.conf.j2
@@ -4,13 +4,7 @@
 
 
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+        {% include_indented "_common/options.conf.j2" %}
         tcp-listen-queue 32;
         tcp-clients 17;
        dnssec-validation no;

diff --git a/bin/tests/system/tcp/ns7/named.conf.j2 b/bin/tests/system/tcp/ns7/named.conf.j2
index f8feba576040fd0297416446255969f526d77d8e..48cc3063a8d3d94b79c3e48fae693cd027bf88e4 100644 (file)
--- a/bin/tests/system/tcp/ns7/named.conf.j2
+++ b/bin/tests/system/tcp/ns7/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        statistics-file "named.stats";

diff --git a/bin/tests/system/timeouts/ns1/named.conf.j2 b/bin/tests/system/timeouts/ns1/named.conf.j2
index bca9e0a38044be75b307402465e39f230063f06d..1a7114f525dd03072bc0c09e32f8e97e7b1c2ef2 100644 (file)
--- a/bin/tests/system/timeouts/ns1/named.conf.j2
+++ b/bin/tests/system/timeouts/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
        recursion no;

diff --git a/bin/tests/system/tkey/ns1/named.conf.j2 b/bin/tests/system/tkey/ns1/named.conf.j2
index fed3f3c7973004428e0d89025602548b6e7ef969..669acf5387e01f0f81dedd1c1490e9a0a9f5eab0 100644 (file)
--- a/bin/tests/system/tkey/ns1/named.conf.j2
+++ b/bin/tests/system/tkey/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/tkeyleak/ns1/named.conf.j2 b/bin/tests/system/tkeyleak/ns1/named.conf.j2
index b7bb534f59a838ebceebf0f337ddbb16b6d0c8bb..edc51b1ab06a35e14e60900a2382837b252974b3 100644 (file)
--- a/bin/tests/system/tkeyleak/ns1/named.conf.j2
+++ b/bin/tests/system/tkeyleak/ns1/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        tkey-gssapi-keytab "dns.keytab";

diff --git a/bin/tests/system/transport_acl/ns1/named.conf.j2 b/bin/tests/system/transport_acl/ns1/named.conf.j2
index ffc083e2c89b482977009891c6bc686e28398a12..c0c3617d64adbac36a041f973b1044eced39dd9a 100644 (file)
--- a/bin/tests/system/transport_acl/ns1/named.conf.j2
+++ b/bin/tests/system/transport_acl/ns1/named.conf.j2
@@ -6,14 +6,9 @@ tls self-signed {
 };
 
 options {
-       port @PORT@;
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        ##
        # generic test
-       listen-on { 10.53.0.1; };
        listen-on port @TLSPORT@ tls self-signed { 10.53.0.1; };
        # test #1
        listen-on port @EXTRAPORT1@ { 10.53.0.1; };
@@ -47,7 +42,6 @@ options {
        # test #8
        listen-on port @EXTRAPORT8@ { 10.53.0.1; };
        ##
-       listen-on-v6 { none; };
        recursion no;
        notify explicit;
        statistics-file "named.stats";

diff --git a/bin/tests/system/tsig/ns1/named.conf.j2 b/bin/tests/system/tsig/ns1/named.conf.j2
index f4eb6a0a6178e8c182c3132021d16155195328a6..c785f183aba826031c52260c734baecab860a607 100644 (file)
--- a/bin/tests/system/tsig/ns1/named.conf.j2
+++ b/bin/tests/system/tsig/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        notify no;
 };

diff --git a/bin/tests/system/ttl/ns1/named.conf.j2 b/bin/tests/system/ttl/ns1/named.conf.j2
index 597e99ce376fafb8b9e08ef77549e8b3e48eeb2f..7c498878e00da6b02d7d610c9e15b78a028411a6 100644 (file)
--- a/bin/tests/system/ttl/ns1/named.conf.j2
+++ b/bin/tests/system/ttl/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        check-integrity no;

diff --git a/bin/tests/system/ttl/ns2/named.conf.j2 b/bin/tests/system/ttl/ns2/named.conf.j2
index b6874ac16b614b09f70297e350ea03ad9c9f1dc9..cb6031f9aa2aff3074da8cd4d470588e86d99eb6 100644 (file)
--- a/bin/tests/system/ttl/ns2/named.conf.j2
+++ b/bin/tests/system/ttl/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        servfail-ttl 0;
        max-recursion-depth 12;
        dnssec-validation no;

diff --git a/bin/tests/system/unknown/ns1/named.conf.j2 b/bin/tests/system/unknown/ns1/named.conf.j2
index 8b2f73ec0a925ebffb66e487d50c638771af1c2f..dcdae6f3ccb23bbe024365310256a388a71fcc56 100644 (file)
--- a/bin/tests/system/unknown/ns1/named.conf.j2
+++ b/bin/tests/system/unknown/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/unknown/ns2/named.conf.j2 b/bin/tests/system/unknown/ns2/named.conf.j2
index 332fc6e2c6ef74fd78cdf53e1075c9d9e149ade4..f1591476e65641850791517cd87efc1da6f0bc68 100644 (file)
--- a/bin/tests/system/unknown/ns2/named.conf.j2
+++ b/bin/tests/system/unknown/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/unknown/ns3/named.conf.j2 b/bin/tests/system/unknown/ns3/named.conf.j2
index 3900e932c0c48d21cefded99a2a4cff45c31f704..b230cad70906db9fe042222e29dec74ae46926b5 100644 (file)
--- a/bin/tests/system/unknown/ns3/named.conf.j2
+++ b/bin/tests/system/unknown/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        notify no;

diff --git a/bin/tests/system/upforwd/ns1/named.conf.j2 b/bin/tests/system/upforwd/ns1/named.conf.j2
index 349dcfac1b6156ec1bb3bfde6b63e23c97a18230..ea409efdead2a8bea89b8e20927b23fa03fe97f4 100644 (file)
--- a/bin/tests/system/upforwd/ns1/named.conf.j2
+++ b/bin/tests/system/upforwd/ns1/named.conf.j2
@@ -4,15 +4,9 @@ key "update.example." {
 };
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
        listen-on tls ephemeral { 10.53.0.1; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/upforwd/ns2/named.conf.j2 b/bin/tests/system/upforwd/ns2/named.conf.j2
index 12dc9e44ab63f0a087d663f4350760b7ee9e89f6..db008683da889b5b08b398e9a21a58ca024caa32 100644 (file)
--- a/bin/tests/system/upforwd/ns2/named.conf.j2
+++ b/bin/tests/system/upforwd/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/upforwd/ns3/named.conf.j2 b/bin/tests/system/upforwd/ns3/named.conf.j2
index be60b296811f55049919a8d17ca2f364573b4f77..f76991ec868adc0251fc505972232b4fb91b6243 100644 (file)
--- a/bin/tests/system/upforwd/ns3/named.conf.j2
+++ b/bin/tests/system/upforwd/ns3/named.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
        listen-on tls ephemeral { 10.53.0.3; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/upforwd/ns3/named2.conf.j2 b/bin/tests/system/upforwd/ns3/named2.conf.j2
index 6b3855ddad23a6024e8c781bd3d8203d7def985a..8d76b1552b4f305edca1ff1556459bd4ced6176e 100644 (file)
--- a/bin/tests/system/upforwd/ns3/named2.conf.j2
+++ b/bin/tests/system/upforwd/ns3/named2.conf.j2
@@ -1,13 +1,7 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
+       {% include_indented "_common/options.conf.j2" %}
        tls-port @TLSPORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
        listen-on tls ephemeral { 10.53.0.3; };
-       listen-on-v6 { none; };
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/views/ns1/named.conf.j2 b/bin/tests/system/views/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/views/ns1/named.conf.j2
+++ b/bin/tests/system/views/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2
index 3c6faccb3636065e716cbaf181f90a092794882b..bbe5e1ec9d419b1b65b6b6d3e1c6c873cc2af778 100644 (file)
--- a/bin/tests/system/views/ns2/named.conf.j2
+++ b/bin/tests/system/views/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/views/ns2/named3.conf.j2 b/bin/tests/system/views/ns2/named3.conf.j2
index ae11b67c4a243a45cde71cad0e3cfc0d724dee87..4810be0be8c9365631e604bf1b36fa3be1a04b47 100644 (file)
--- a/bin/tests/system/views/ns2/named3.conf.j2
+++ b/bin/tests/system/views/ns2/named3.conf.j2
@@ -1,13 +1,7 @@
 {% set zone_names = zone_names | default([]) %}
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2
index 4bf48a9105f8a63d8e3b6169f6909762e6c43cec..ae705222bbede6358c52fe37af314734b508f597 100644 (file)
--- a/bin/tests/system/views/ns3/named.conf.j2
+++ b/bin/tests/system/views/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2
index 88610b1cbf1f3c8ac79599522a753cfb864ff8e9..6bd2e08896552e9b3f98bc5b680c3f8ed0f9d823 100644 (file)
--- a/bin/tests/system/views/ns3/named2.conf.j2
+++ b/bin/tests/system/views/ns3/named2.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2
index 81b168be31b1ebfdd3f79d517f938f1adf38072c..dbdd18f68545b8947f93c99b70349ebacfca9e20 100644 (file)
--- a/bin/tests/system/views/ns5/named.conf.j2
+++ b/bin/tests/system/views/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/wildcard/ns1/named.conf.j2 b/bin/tests/system/wildcard/ns1/named.conf.j2
index 670dd2d33d8d877d736121b9f06b064ba9fe7a6b..9d6dc0e924df535a3f126b20ec83e9d854b3ebd7 100644 (file)
--- a/bin/tests/system/wildcard/ns1/named.conf.j2
+++ b/bin/tests/system/wildcard/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2
index fc73e53a4f081772ad56647c770f693b90c6f4c5..1aff3cc702214c97bf70d40dc82cdc580fe542ec 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/wildcard/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
 };
 

diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2
index db90e4f2886f306945bfad49494e85d249fda93c..423cf682a73ad545694c0e51bebf6ce269866330 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.j2
+++ b/bin/tests/system/wildcard/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/wildcard/ns4/named.conf.j2 b/bin/tests/system/wildcard/ns4/named.conf.j2
index 4529f724a0a57a56e15ee77f4cf7d00b5adc695e..fd32098dce2822c26da69acd85b5d82bf9a1dbd6 100644 (file)
--- a/bin/tests/system/wildcard/ns4/named.conf.j2
+++ b/bin/tests/system/wildcard/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
        forward only;
        forwarders { 10.53.0.2; };

diff --git a/bin/tests/system/wildcard/ns5/named.conf.j2 b/bin/tests/system/wildcard/ns5/named.conf.j2
index a76c19def50c122bdd7720ba72761931efb73339..423cf682a73ad545694c0e51bebf6ce269866330 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.j2
+++ b/bin/tests/system/wildcard/ns5/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.5;
-       notify-source 10.53.0.5;
-       transfer-source 10.53.0.5;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.5; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation yes;
 };
 

diff --git a/bin/tests/system/xfer/ns1/named.conf.j2 b/bin/tests/system/xfer/ns1/named.conf.j2
index 5df9978025dc9f7619016444fc8db2b276bcafde..60c7a30f922ea977ea9ea3aa37af44d5ad884537 100644 (file)
--- a/bin/tests/system/xfer/ns1/named.conf.j2
+++ b/bin/tests/system/xfer/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns1/named2.conf.j2 b/bin/tests/system/xfer/ns1/named2.conf.j2
index 888c0620439bce3ed3bc33b6895c3fd4378adf99..5295655db914cf906ab9d393da16d54f77aa76c8 100644 (file)
--- a/bin/tests/system/xfer/ns1/named2.conf.j2
+++ b/bin/tests/system/xfer/ns1/named2.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns1/named3.conf.j2 b/bin/tests/system/xfer/ns1/named3.conf.j2
index ca395804d2bb23836136920162b878741e0674ef..6d04e016e4a43ffedcb54395100f50e944c09d76 100644 (file)
--- a/bin/tests/system/xfer/ns1/named3.conf.j2
+++ b/bin/tests/system/xfer/ns1/named3.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2
index f412a434f3dca15031e77788c746984cdbd322c5..791f826e9fac3c176316b1a64460f3d45f236e9e 100644 (file)
--- a/bin/tests/system/xfer/ns2/named.conf.j2
+++ b/bin/tests/system/xfer/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2
index 25dbbc490e14dc320235debcb5a3f9ccb3a6bada..8052a92741881e4c7297aea074c089c814441744 100644 (file)
--- a/bin/tests/system/xfer/ns3/named.conf.j2
+++ b/bin/tests/system/xfer/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        dnssec-validation no;
 };

diff --git a/bin/tests/system/xfer/ns4/named.conf.j2 b/bin/tests/system/xfer/ns4/named.conf.j2
index be399c6a722b6c2c8da9133e0e9db78ec45dd76f..e82e0e528f4af2d39c8b8fec7bff9c84667a6fbc 100644 (file)
--- a/bin/tests/system/xfer/ns4/named.conf.j2
+++ b/bin/tests/system/xfer/ns4/named.conf.j2
@@ -1,12 +1,6 @@
 {% set ns4_as_secondary_for_nil = ns4_as_secondary_for_nil | default(False) %}
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns6/named.conf.j2 b/bin/tests/system/xfer/ns6/named.conf.j2
index a28170bc1798f8203005561a5b4b64f767f6651b..9d6c31947b57edb1550b588fcc6a165d2763aaa5 100644 (file)
--- a/bin/tests/system/xfer/ns6/named.conf.j2
+++ b/bin/tests/system/xfer/ns6/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns7/named.conf.j2 b/bin/tests/system/xfer/ns7/named.conf.j2
index 9b25c7cdbeb6c6416d9c71f7a0341db33d7de0a7..0b677a7e5747e6cc7ba4820b4713e1232327c3f3 100644 (file)
--- a/bin/tests/system/xfer/ns7/named.conf.j2
+++ b/bin/tests/system/xfer/ns7/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.7;
-       notify-source 10.53.0.7;
-       transfer-source 10.53.0.7;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.7; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xfer/ns8/named.conf.j2 b/bin/tests/system/xfer/ns8/named.conf.j2
index 3c020ef14a131086a3f5101459b6842b7e3ce4ca..37707b36eb4effade0b7c46a9bd46bffb1e69bb0 100644 (file)
--- a/bin/tests/system/xfer/ns8/named.conf.j2
+++ b/bin/tests/system/xfer/ns8/named.conf.j2
@@ -1,13 +1,7 @@
 {% include "_common/controls.conf.j2" %}
 
 options {
-       query-source address 10.53.0.8;
-       notify-source 10.53.0.8;
-       transfer-source 10.53.0.8;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.8; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

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 0da1e0de29bd3dacb67d9d25e2dd2bb09cd46409..364cb1aca7c418c016e868135fc41afe2c406a60 100644 (file)
--- a/bin/tests/system/xfer_servers_list/ns2/named.conf.j2
+++ b/bin/tests/system/xfer_servers_list/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       port @PORT@;
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       transfer-source 10.53.0.2;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

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 6d9cfee088d526fdc2d91888262330b63e47fa88..b186fdb50630bc4054d5420d55d0ea732cc98933 100644 (file)
--- a/bin/tests/system/xfer_servers_list/ns3/named.conf.j2
+++ b/bin/tests/system/xfer_servers_list/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       port @PORT@;
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
-       transfer-source 10.53.0.3;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

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 08fe9a2d09a97369db74f5f862c7c306022d9aed..62c39c25e70f861eecd2f1f99dbfb045e920d109 100644 (file)
--- a/bin/tests/system/xfer_servers_list/ns4/named.conf.j2
+++ b/bin/tests/system/xfer_servers_list/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       port @PORT@;
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
-       transfer-source 10.53.0.4;
-       pid-file "named.pid";
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
 };
 

diff --git a/bin/tests/system/xferquota/ns1/named.conf.j2 b/bin/tests/system/xferquota/ns1/named.conf.j2
index 09abe253262fd7f2919207fc5621d6a7b2d25d08..8877d9c0d30cc4423039d9742c382f49dad71fb9 100644 (file)
--- a/bin/tests/system/xferquota/ns1/named.conf.j2
+++ b/bin/tests/system/xferquota/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xferquota/ns2/named.conf.j2 b/bin/tests/system/xferquota/ns2/named.conf.j2
index 66edc6a4d7a451d03647119605897fadb2e1a454..62e3f4f88ca563573ec723d55960a84afed8f8ee 100644 (file)
--- a/bin/tests/system/xferquota/ns2/named.conf.j2
+++ b/bin/tests/system/xferquota/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        allow-transfer { any; };
        recursion no;
        dnssec-validation no;

diff --git a/bin/tests/system/xferquota/ns3/named.conf.j2 b/bin/tests/system/xferquota/ns3/named.conf.j2
index c882985899aaf390dc68ac5cd2376be1221e9c8e..c86417e227841592b5ef39a37af22736a4bb25cd 100644 (file)
--- a/bin/tests/system/xferquota/ns3/named.conf.j2
+++ b/bin/tests/system/xferquota/ns3/named.conf.j2
@@ -12,13 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 

diff --git a/bin/tests/system/zero/ns1/named.conf.j2 b/bin/tests/system/zero/ns1/named.conf.j2
index 0cc901254d08438b15768f1a84b626db4afa755a..2bb3e5abae9205be292edad263d544ecde098308 100644 (file)
--- a/bin/tests/system/zero/ns1/named.conf.j2
+++ b/bin/tests/system/zero/ns1/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/zero/ns2/named.conf.j2 b/bin/tests/system/zero/ns2/named.conf.j2
index 0aea6abe351766f0a08514eed513aa6229803b1f..b7176a341c509ac0c431e710077b7ef7b74aca2c 100644 (file)
--- a/bin/tests/system/zero/ns2/named.conf.j2
+++ b/bin/tests/system/zero/ns2/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
        allow-transfer { any; };

diff --git a/bin/tests/system/zero/ns3/named.conf.j2 b/bin/tests/system/zero/ns3/named.conf.j2
index b38f2157e821ebd770efb3a602da21e7f29aa2dd..545a7eab8e0a64203f6d4c9b6b49f5d8bb8a43e6 100644 (file)
--- a/bin/tests/system/zero/ns3/named.conf.j2
+++ b/bin/tests/system/zero/ns3/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        dnssec-validation no;
        servfail-ttl 0;
 };

diff --git a/bin/tests/system/zero/ns4/named.conf.j2 b/bin/tests/system/zero/ns4/named.conf.j2
index e1f32a8b9629bfeb5e645f0f17564624589cfde2..a6d5b3a9186676d0f214ce139d1bffb25028b2bd 100644 (file)
--- a/bin/tests/system/zero/ns4/named.conf.j2
+++ b/bin/tests/system/zero/ns4/named.conf.j2
@@ -1,11 +1,5 @@
 options {
-       query-source address 10.53.0.4;
-       notify-source 10.53.0.4;
-       transfer-source 10.53.0.4;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.4; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/zonechecks/ns1/named.conf.j2 b/bin/tests/system/zonechecks/ns1/named.conf.j2
index 209d3cbcd3a4d422e21fa0f42ceb6cf2a73c746c..e18e8d2780e609df6611bb6431ff92a2aeb2ab56 100644 (file)
--- a/bin/tests/system/zonechecks/ns1/named.conf.j2
+++ b/bin/tests/system/zonechecks/ns1/named.conf.j2
@@ -1,13 +1,7 @@
 // NS1
 
 options {
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };

diff --git a/bin/tests/system/zonechecks/ns2/named.conf.j2 b/bin/tests/system/zonechecks/ns2/named.conf.j2
index 12395ba34cede134f8239ea4a4249d23f6951fe3..73b44ca196c2a95aef720e75c56b9cb87f1cb21a 100644 (file)
--- a/bin/tests/system/zonechecks/ns2/named.conf.j2
+++ b/bin/tests/system/zonechecks/ns2/named.conf.j2
@@ -1,13 +1,7 @@
 // NS2
 
 options {
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
+       {% include_indented "_common/options.conf.j2" %}
        recursion no;
        dnssec-validation no;
 };