Replace .in with .j2 templates for cases with namedX.conf

The following tests use multiple named configs. Previously, these have
been rendered with copy_setports in tests.sh when needed. Transform
these into jinja2 templates and render them during setup. In the tests,
the copy_setports invocations can be then replaced with a simple cp.

diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns2/named1.conf.in
rename to bin/tests/system/acl/ns2/named.conf.j2

diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns2/named2.conf.in
rename to bin/tests/system/acl/ns2/named2.conf.j2

diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns2/named3.conf.in
rename to bin/tests/system/acl/ns2/named3.conf.j2

diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns2/named4.conf.in
rename to bin/tests/system/acl/ns2/named4.conf.j2

diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns2/named5.conf.in
rename to bin/tests/system/acl/ns2/named5.conf.j2

diff --git a/bin/tests/system/acl/ns3/named.conf.in b/bin/tests/system/acl/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns3/named.conf.in
rename to bin/tests/system/acl/ns3/named.conf.j2

diff --git a/bin/tests/system/acl/ns4/named.conf.in b/bin/tests/system/acl/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/acl/ns4/named.conf.in
rename to bin/tests/system/acl/ns4/named.conf.j2

diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index f563d78cddaccadccaef41103794d5a2088b16ab..bf1b53a3d8f5991d3e8dca981ecab3275f4a8b7b 100644 (file)
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@@ -15,6 +15,3 @@
 
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/tsigzone.db
-copy_setports ns2/named1.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf

diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index f98bc345e2b3a5d2e89017f93cab707ebbe6a048..50ff78a0aa722f8f64ff3bb2d49e678f6b061c91 100644 (file)
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -40,7 +40,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 && {
   status=1
 }
 
-copy_setports ns2/named2.conf.in ns2/named.conf
+cp ns2/named2.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 
@@ -72,7 +72,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 && {
 
 echo_i "testing nested ACL processing"
 # all combinations of 10.53.0.{1|2} with key {one|two}, should succeed
-copy_setports ns2/named3.conf.in ns2/named.conf
+cp ns2/named3.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 
@@ -139,7 +139,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 || {
 }
 
 # now we only allow 10.53.0.1 *and* key one, or 10.53.0.2 *and* key two
-copy_setports ns2/named4.conf.in ns2/named.conf
+cp ns2/named4.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 
@@ -189,7 +189,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 || {
 }
 
 echo_i "testing allow-query-on ACL processing"
-copy_setports ns2/named5.conf.in ns2/named.conf
+cp ns2/named5.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 t=$((t + 1))

diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/additional/ns1/named1.conf.in
rename to bin/tests/system/additional/ns1/named.conf.j2

diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.j2
similarity index 100%
rename from bin/tests/system/additional/ns1/named2.conf.in
rename to bin/tests/system/additional/ns1/named2.conf.j2

diff --git a/bin/tests/system/additional/ns1/named3.conf.in b/bin/tests/system/additional/ns1/named3.conf.j2
similarity index 100%
rename from bin/tests/system/additional/ns1/named3.conf.in
rename to bin/tests/system/additional/ns1/named3.conf.j2

diff --git a/bin/tests/system/additional/ns1/named4.conf.in b/bin/tests/system/additional/ns1/named4.conf.j2
similarity index 100%
rename from bin/tests/system/additional/ns1/named4.conf.in
rename to bin/tests/system/additional/ns1/named4.conf.j2

diff --git a/bin/tests/system/additional/ns2/named.conf.in b/bin/tests/system/additional/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/additional/ns2/named.conf.in
rename to bin/tests/system/additional/ns2/named.conf.j2

diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/additional/ns3/named.conf.in
rename to bin/tests/system/additional/ns3/named.conf.j2

diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh
deleted file mode 100644 (file)
index d117b4c..0000000
--- a/bin/tests/system/additional/setup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named1.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 193c9f9270aeb68b25d5677c861d0ff4705e4233..27dca50e7978c2e32e42b16d2cac6b0a1b678fe9 100644 (file)
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -268,7 +268,7 @@ minimal=yes
 dotests
 
 echo_i "reconfiguring server: minimal-responses no"
-copy_setports ns1/named2.conf.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 echo_i "testing with 'minimal-responses no;'"
@@ -286,7 +286,7 @@ if [ $ret -eq 1 ]; then
 fi
 
 echo_i "reconfiguring server: minimal-any yes"
-copy_setports ns1/named3.conf.in ns1/named.conf
+cp ns1/named3.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 n=$((n + 1))
@@ -324,7 +324,7 @@ minimal=no-auth
 dotests
 
 echo_i "reconfiguring server: minimal-responses no-auth-recursive"
-copy_setports ns1/named4.conf.in ns1/named.conf
+cp ns1/named4.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 echo_i "testing with 'minimal-responses no-auth-recursive;'"
@@ -356,7 +356,7 @@ if [ $ret -eq 1 ]; then
 fi
 
 echo_i "reconfiguring server: minimal-responses no"
-copy_setports ns1/named2.conf.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 n=$((n + 1))

diff --git a/bin/tests/system/addzone/ns2/named1.conf.in b/bin/tests/system/addzone/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/addzone/ns2/named1.conf.in
rename to bin/tests/system/addzone/ns2/named.conf.j2

diff --git a/bin/tests/system/addzone/ns2/named2.conf.in b/bin/tests/system/addzone/ns2/named2.conf.j2
similarity index 100%
rename from bin/tests/system/addzone/ns2/named2.conf.in
rename to bin/tests/system/addzone/ns2/named2.conf.j2

diff --git a/bin/tests/system/addzone/ns2/named3.conf.in b/bin/tests/system/addzone/ns2/named3.conf.j2
similarity index 100%
rename from bin/tests/system/addzone/ns2/named3.conf.in
rename to bin/tests/system/addzone/ns2/named3.conf.j2

diff --git a/bin/tests/system/addzone/ns3/named1.conf.in b/bin/tests/system/addzone/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/addzone/ns3/named1.conf.in
rename to bin/tests/system/addzone/ns3/named.conf.j2

diff --git a/bin/tests/system/addzone/ns3/named2.conf.in b/bin/tests/system/addzone/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/addzone/ns3/named2.conf.in
rename to bin/tests/system/addzone/ns3/named2.conf.j2

diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index b6e778f629da6d82d491fcdcaa7e73b35b4c3359..aeef333e19d78f1fbba5a36a819ac30cf70a8cc1 100644 (file)
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@@ -17,8 +17,5 @@ cp -f ns1/redirect.db.1 ns1/redirect.db
 cp -f ns2/redirect.db.1 ns2/redirect.db
 cp -f ns3/redirect.db.1 ns3/redirect.db
 
-copy_setports ns2/named1.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-
 cp -f ns2/default.nzf.in ns2/3bf305731dd26307.nzf
 mkdir ns2/new-zones

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index ed897b9ba72e9820d3afbf9e97c984afcd021a7d..a59bc355d9334ee62300ba571ba5ef9f0643ee8d 100755 (executable)
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -482,8 +482,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "reconfiguring server with multiple views"
-rm -f ns2/named.conf
-copy_setports ns2/named2.conf.in ns2/named.conf
+cp ns2/named2.conf ns2/named.conf
 rndc_reconfig ns2 10.53.0.2
 
 echo_i "adding new zone to external view ($n)"
@@ -608,8 +607,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "reconfiguring server with multiple views and new-zones-directory"
-rm -f ns2/named.conf
-copy_setports ns2/named3.conf.in ns2/named.conf
+cp ns2/named3.conf ns2/named.conf
 rndc_reconfig ns2 10.53.0.2
 
 echo_i "checking new zone is still loaded after dir change ($n)"
@@ -686,7 +684,7 @@ status=$((status + ret))
 echo_i "check delzone after reconfig failure ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 addzone 'inlinesec.example. IN { type secondary; file "inlinesec.db"; masterfile-format text; primaries { test; }; };' >/dev/null 2>&1 || ret=1
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 $RNDCCMD 10.53.0.3 delzone inlinesec.example >/dev/null 2>&1 || ret=1
 n=$((n + 1))

diff --git a/bin/tests/system/allow-query/ns1/named.conf.in b/bin/tests/system/allow-query/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns1/named.conf.in
rename to bin/tests/system/allow-query/ns1/named.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/controls.conf.j2 b/bin/tests/system/allow-query/ns2/controls.conf.j2
new file mode 120000 (symlink)
index 0000000..f1371a0
--- /dev/null
+++ b/bin/tests/system/allow-query/ns2/controls.conf.j2
@@ -0,0 +1 @@
+../../_common/controls.conf.in
\ No newline at end of file

diff --git a/bin/tests/system/allow-query/ns2/named01.conf.in b/bin/tests/system/allow-query/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named01.conf.in
rename to bin/tests/system/allow-query/ns2/named.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named02.conf.in
rename to bin/tests/system/allow-query/ns2/named02.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named03.conf.in
rename to bin/tests/system/allow-query/ns2/named03.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named04.conf.in b/bin/tests/system/allow-query/ns2/named04.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named04.conf.in
rename to bin/tests/system/allow-query/ns2/named04.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named05.conf.in
rename to bin/tests/system/allow-query/ns2/named05.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named06.conf.in b/bin/tests/system/allow-query/ns2/named06.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named06.conf.in
rename to bin/tests/system/allow-query/ns2/named06.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named07.conf.in
rename to bin/tests/system/allow-query/ns2/named07.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named08.conf.in b/bin/tests/system/allow-query/ns2/named08.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named08.conf.in
rename to bin/tests/system/allow-query/ns2/named08.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named09.conf.in
rename to bin/tests/system/allow-query/ns2/named09.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named10.conf.in
rename to bin/tests/system/allow-query/ns2/named10.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named11.conf.in
rename to bin/tests/system/allow-query/ns2/named11.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named12.conf.in
rename to bin/tests/system/allow-query/ns2/named12.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named21.conf.in
rename to bin/tests/system/allow-query/ns2/named21.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named22.conf.in b/bin/tests/system/allow-query/ns2/named22.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named22.conf.in
rename to bin/tests/system/allow-query/ns2/named22.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named23.conf.in
rename to bin/tests/system/allow-query/ns2/named23.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named24.conf.in b/bin/tests/system/allow-query/ns2/named24.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named24.conf.in
rename to bin/tests/system/allow-query/ns2/named24.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named25.conf.in
rename to bin/tests/system/allow-query/ns2/named25.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named26.conf.in b/bin/tests/system/allow-query/ns2/named26.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named26.conf.in
rename to bin/tests/system/allow-query/ns2/named26.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named27.conf.in
rename to bin/tests/system/allow-query/ns2/named27.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named28.conf.in b/bin/tests/system/allow-query/ns2/named28.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named28.conf.in
rename to bin/tests/system/allow-query/ns2/named28.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named29.conf.in
rename to bin/tests/system/allow-query/ns2/named29.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named30.conf.in
rename to bin/tests/system/allow-query/ns2/named30.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named31.conf.in
rename to bin/tests/system/allow-query/ns2/named31.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named32.conf.in
rename to bin/tests/system/allow-query/ns2/named32.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named33.conf.in
rename to bin/tests/system/allow-query/ns2/named33.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named34.conf.in b/bin/tests/system/allow-query/ns2/named34.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named34.conf.in
rename to bin/tests/system/allow-query/ns2/named34.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named40.conf.in
rename to bin/tests/system/allow-query/ns2/named40.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named53.conf.in b/bin/tests/system/allow-query/ns2/named53.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named53.conf.in
rename to bin/tests/system/allow-query/ns2/named53.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named54.conf.in
rename to bin/tests/system/allow-query/ns2/named54.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named55.conf.in b/bin/tests/system/allow-query/ns2/named55.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named55.conf.in
rename to bin/tests/system/allow-query/ns2/named55.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named56.conf.in
rename to bin/tests/system/allow-query/ns2/named56.conf.j2

diff --git a/bin/tests/system/allow-query/ns2/named57.conf.in b/bin/tests/system/allow-query/ns2/named57.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns2/named57.conf.in
rename to bin/tests/system/allow-query/ns2/named57.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named1.conf.in b/bin/tests/system/allow-query/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named1.conf.in
rename to bin/tests/system/allow-query/ns3/named.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named2.conf.in b/bin/tests/system/allow-query/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named2.conf.in
rename to bin/tests/system/allow-query/ns3/named2.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named3.conf.in b/bin/tests/system/allow-query/ns3/named3.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named3.conf.in
rename to bin/tests/system/allow-query/ns3/named3.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named4.conf.in b/bin/tests/system/allow-query/ns3/named4.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named4.conf.in
rename to bin/tests/system/allow-query/ns3/named4.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named5.conf.in b/bin/tests/system/allow-query/ns3/named5.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named5.conf.in
rename to bin/tests/system/allow-query/ns3/named5.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named6.conf.in b/bin/tests/system/allow-query/ns3/named6.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named6.conf.in
rename to bin/tests/system/allow-query/ns3/named6.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named7.conf.in b/bin/tests/system/allow-query/ns3/named7.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named7.conf.in
rename to bin/tests/system/allow-query/ns3/named7.conf.j2

diff --git a/bin/tests/system/allow-query/ns3/named8.conf.in b/bin/tests/system/allow-query/ns3/named8.conf.j2
similarity index 100%
rename from bin/tests/system/allow-query/ns3/named8.conf.in
rename to bin/tests/system/allow-query/ns3/named8.conf.j2

diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh
deleted file mode 100644 (file)
index 886c8ac..0000000
--- a/bin/tests/system/allow-query/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ../_common/controls.conf.in ns2/controls.conf
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named01.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf

diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh
index f332ce15e1fcc21eebe3d528fecf18f68f20d297..9cb1530b4953a2ebca9460a1d71ece9709a5141e 100644 (file)
--- a/bin/tests/system/allow-query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -75,7 +75,7 @@ status=$((status + ret))
 
 # Test 2 - explicit any, query allowed
 n=$((n + 1))
-copy_setports ns2/named02.conf.in ns2/named.conf
+cp ns2/named02.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: explicit any - query allowed"
@@ -88,7 +88,7 @@ status=$((status + ret))
 
 # Test 3 - none, query refused
 n=$((n + 1))
-copy_setports ns2/named03.conf.in ns2/named.conf
+cp ns2/named03.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: none - query refused"
@@ -115,7 +115,7 @@ status=$((status + ret))
 
 # Test 4 - address allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named04.conf.in ns2/named.conf
+cp ns2/named04.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: address allowed - query allowed"
@@ -128,7 +128,7 @@ status=$((status + ret))
 
 # Test 5 - address not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named05.conf.in ns2/named.conf
+cp ns2/named05.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: address not allowed - query refused"
@@ -142,7 +142,7 @@ status=$((status + ret))
 
 # Test 6 - address disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named06.conf.in ns2/named.conf
+cp ns2/named06.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: address disallowed - query refused"
@@ -156,7 +156,7 @@ status=$((status + ret))
 
 # Test 7 - acl allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named07.conf.in ns2/named.conf
+cp ns2/named07.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: acl allowed - query allowed"
@@ -169,7 +169,7 @@ status=$((status + ret))
 
 # Test 8 - acl not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named08.conf.in ns2/named.conf
+cp ns2/named08.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: acl not allowed - query refused"
@@ -183,7 +183,7 @@ status=$((status + ret))
 
 # Test 9 - acl disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named09.conf.in ns2/named.conf
+cp ns2/named09.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: acl disallowed - query refused"
@@ -197,7 +197,7 @@ status=$((status + ret))
 
 # Test 10 - key allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named10.conf.in ns2/named.conf
+cp ns2/named10.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: key allowed - query allowed"
@@ -210,7 +210,7 @@ status=$((status + ret))
 
 # Test 11 - key not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named11.conf.in ns2/named.conf
+cp ns2/named11.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: key not allowed - query refused"
@@ -224,7 +224,7 @@ status=$((status + ret))
 
 # Test 12 - key disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named12.conf.in ns2/named.conf
+cp ns2/named12.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: key disallowed - query refused"
@@ -241,7 +241,7 @@ status=$((status + ret))
 n=20
 # Test 21 - views default, query allowed
 n=$((n + 1))
-copy_setports ns2/named21.conf.in ns2/named.conf
+cp ns2/named21.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views default - query allowed"
@@ -254,7 +254,7 @@ status=$((status + ret))
 
 # Test 22 - views explicit any, query allowed
 n=$((n + 1))
-copy_setports ns2/named22.conf.in ns2/named.conf
+cp ns2/named22.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views explicit any - query allowed"
@@ -267,7 +267,7 @@ status=$((status + ret))
 
 # Test 23 - views none, query refused
 n=$((n + 1))
-copy_setports ns2/named23.conf.in ns2/named.conf
+cp ns2/named23.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views none - query refused"
@@ -281,7 +281,7 @@ status=$((status + ret))
 
 # Test 24 - views address allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named24.conf.in ns2/named.conf
+cp ns2/named24.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views address allowed - query allowed"
@@ -294,7 +294,7 @@ status=$((status + ret))
 
 # Test 25 - views address not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named25.conf.in ns2/named.conf
+cp ns2/named25.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views address not allowed - query refused"
@@ -308,7 +308,7 @@ status=$((status + ret))
 
 # Test 26 - views address disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named26.conf.in ns2/named.conf
+cp ns2/named26.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views address disallowed - query refused"
@@ -322,7 +322,7 @@ status=$((status + ret))
 
 # Test 27 - views acl allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named27.conf.in ns2/named.conf
+cp ns2/named27.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views acl allowed - query allowed"
@@ -335,7 +335,7 @@ status=$((status + ret))
 
 # Test 28 - views acl not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named28.conf.in ns2/named.conf
+cp ns2/named28.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views acl not allowed - query refused"
@@ -349,7 +349,7 @@ status=$((status + ret))
 
 # Test 29 - views acl disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named29.conf.in ns2/named.conf
+cp ns2/named29.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views acl disallowed - query refused"
@@ -363,7 +363,7 @@ status=$((status + ret))
 
 # Test 30 - views key allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named30.conf.in ns2/named.conf
+cp ns2/named30.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views key allowed - query allowed"
@@ -376,7 +376,7 @@ status=$((status + ret))
 
 # Test 31 - views key not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named31.conf.in ns2/named.conf
+cp ns2/named31.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views key not allowed - query refused"
@@ -390,7 +390,7 @@ status=$((status + ret))
 
 # Test 32 - views key disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named32.conf.in ns2/named.conf
+cp ns2/named32.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views key disallowed - query refused"
@@ -404,7 +404,7 @@ status=$((status + ret))
 
 # Test 33 - views over options, views allow, query allowed
 n=$((n + 1))
-copy_setports ns2/named33.conf.in ns2/named.conf
+cp ns2/named33.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views allow - query allowed"
@@ -417,7 +417,7 @@ status=$((status + ret))
 
 # Test 34 - views over options, views disallow, query refused
 n=$((n + 1))
-copy_setports ns2/named34.conf.in ns2/named.conf
+cp ns2/named34.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views disallow - query refused"
@@ -435,7 +435,7 @@ n=40
 
 # Test 41 - zone default, query allowed
 n=$((n + 1))
-copy_setports ns2/named40.conf.in ns2/named.conf
+cp ns2/named40.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zone default - query allowed"
@@ -565,7 +565,7 @@ status=$((status + ret))
 
 # Test 53 - zones over options, zones allow, query allowed
 n=$((n + 1))
-copy_setports ns2/named53.conf.in ns2/named.conf
+cp ns2/named53.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views allow - query allowed"
@@ -578,7 +578,7 @@ status=$((status + ret))
 
 # Test 54 - zones over options, zones disallow, query refused
 n=$((n + 1))
-copy_setports ns2/named54.conf.in ns2/named.conf
+cp ns2/named54.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views disallow - query refused"
@@ -592,7 +592,7 @@ status=$((status + ret))
 
 # Test 55 - zones over views, zones allow, query allowed
 n=$((n + 1))
-copy_setports ns2/named55.conf.in ns2/named.conf
+cp ns2/named55.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zones over views, views allow - query allowed"
@@ -605,7 +605,7 @@ status=$((status + ret))
 
 # Test 56 - zones over views, zones disallow, query refused
 n=$((n + 1))
-copy_setports ns2/named56.conf.in ns2/named.conf
+cp ns2/named56.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zones over views, views disallow - query refused"
@@ -619,7 +619,7 @@ status=$((status + ret))
 
 # Test 57 - zones over views, zones disallow, query refused (allow-query-on)
 n=$((n + 1))
-copy_setports ns2/named57.conf.in ns2/named.conf
+cp ns2/named57.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zones over views, allow-query-on"
@@ -663,7 +663,7 @@ status=$((status + ret))
 
 # Test 60 - block recursion-on, allow query-cache-on
 n=$((n + 1))
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: block recursion-on, allow query-cache-on"
@@ -682,7 +682,7 @@ status=$((status + ret))
 
 # Test 61 - inheritance of allow-query-cache-on from allow-recursion-on
 n=$((n + 1))
-copy_setports ns3/named3.conf.in ns3/named.conf
+cp ns3/named3.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: inheritance of allow-query-cache-on"
@@ -709,7 +709,7 @@ status=$((status + ret))
 
 # Test 62 - inheritance of allow-recursion-on from allow-query-cache-on
 n=$((n + 1))
-copy_setports ns3/named4.conf.in ns3/named.conf
+cp ns3/named4.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: inheritance of allow-recursion-on"
@@ -736,7 +736,7 @@ status=$((status + ret))
 
 # Test 63 - allow-query-cache inheritance from allow-recursion
 n=$((n + 1))
-copy_setports ns3/named5.conf.in ns3/named.conf
+cp ns3/named5.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: inheritance of allow-query-cache from allow-recursion"
@@ -756,7 +756,7 @@ status=$((status + ret))
 # Test 64 - allow-query-cache no inheritance from allow-recursion as it is
 # defined in the options
 n=$((n + 1))
-copy_setports ns3/named6.conf.in ns3/named.conf
+cp ns3/named6.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: allow-query-cache defined in options, so it does not inherit from allow-recursion"
@@ -771,7 +771,7 @@ status=$((status + ret))
 
 # Test 65 - allow-query-cache inherits from allow-recursion before allow-query
 n=$((n + 1))
-copy_setports ns3/named7.conf.in ns3/named.conf
+cp ns3/named7.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: allow-query-cache inherits from allow-recursion before allow-query"
@@ -786,7 +786,7 @@ status=$((status + ret))
 
 # Test 66 - allow-recursion inheritance from allow-query
 n=$((n + 1))
-copy_setports ns3/named8.conf.in ns3/named.conf
+cp ns3/named8.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: inheritance of allow-query-cache from allow-recursion"

diff --git a/bin/tests/system/dns64/ns1/named.conf1.in b/bin/tests/system/dns64/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/dns64/ns1/named.conf1.in
rename to bin/tests/system/dns64/ns1/named.conf.j2

diff --git a/bin/tests/system/dns64/ns1/named.conf2.in b/bin/tests/system/dns64/ns1/named2.conf.j2
similarity index 100%
rename from bin/tests/system/dns64/ns1/named.conf2.in
rename to bin/tests/system/dns64/ns1/named2.conf.j2

diff --git a/bin/tests/system/dns64/ns1/named.conf3.in b/bin/tests/system/dns64/ns1/named3.conf.j2
similarity index 100%
rename from bin/tests/system/dns64/ns1/named.conf3.in
rename to bin/tests/system/dns64/ns1/named3.conf.j2

diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/dns64/ns2/named.conf.in
rename to bin/tests/system/dns64/ns2/named.conf.j2

diff --git a/bin/tests/system/dns64/ns3/named.conf.in b/bin/tests/system/dns64/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/dns64/ns3/named.conf.in
rename to bin/tests/system/dns64/ns3/named.conf.j2

diff --git a/bin/tests/system/dns64/ns4/named.conf.in b/bin/tests/system/dns64/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/dns64/ns4/named.conf.in
rename to bin/tests/system/dns64/ns4/named.conf.j2

diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index e6df4d0c121528860fdd56bcb91e6912a6eb7a44..c162d88a9a47168b7887b2ac3363494e153be70b 100644 (file)
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@@ -13,9 +13,4 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf1.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index df6e05b1d32a3d3d9ba6ddb6dcd89939a8fbf374..85f5773019b3139512a87e9a22e6c7bf968e4ec4 100644 (file)
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@@ -1407,7 +1407,7 @@ n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns1/named.conf2.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rndc_reload ns1 10.53.0.1
 
 echo_i "checking 'dig +dns64prefix' with multiple prefixes ($n)"
@@ -1419,7 +1419,7 @@ n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns1/named.conf3.in ns1/named.conf
+cp ns1/named3.conf ns1/named.conf
 rndc_reload ns1 10.53.0.1
 
 echo_i "checking 'dig +dns64prefix' with no prefixes ($n)"

diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.in b/bin/tests/system/fetchlimit/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns1/named.conf.in
rename to bin/tests/system/fetchlimit/ns1/named.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns2/named.conf.in
rename to bin/tests/system/fetchlimit/ns2/named.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns3/named1.conf.in
rename to bin/tests/system/fetchlimit/ns3/named.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns3/named2.conf.in
rename to bin/tests/system/fetchlimit/ns3/named2.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns3/named3.conf.in
rename to bin/tests/system/fetchlimit/ns3/named3.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns5/named1.conf.in b/bin/tests/system/fetchlimit/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns5/named1.conf.in
rename to bin/tests/system/fetchlimit/ns5/named.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.in b/bin/tests/system/fetchlimit/ns5/named2.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns5/named2.conf.in
rename to bin/tests/system/fetchlimit/ns5/named2.conf.j2

diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.in b/bin/tests/system/fetchlimit/ns5/named3.conf.j2
similarity index 100%
rename from bin/tests/system/fetchlimit/ns5/named3.conf.in
rename to bin/tests/system/fetchlimit/ns5/named3.conf.j2

diff --git a/bin/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh
deleted file mode 100644 (file)
index f98749b..0000000
--- a/bin/tests/system/fetchlimit/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-copy_setports ns5/named1.conf.in ns5/named.conf

diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
index c6c828f8f83cfb824a40b3124a42ff888875a715..c0910f32b1b12eafd3ce520c1551c13827057e9c 100644 (file)
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@@ -166,7 +166,7 @@ quota=$2
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 
 n=$((n + 1))
@@ -209,7 +209,7 @@ drops=$(grep 'queries dropped' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns3/named3.conf.in ns3/named.conf
+cp ns3/named3.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 
 n=$((n + 1))
@@ -298,7 +298,7 @@ status=$((status + ret))
 
 echo_i "stop ns5"
 stop_server --use-rndc --port ${CONTROLPORT} ns5
-copy_setports ns5/named2.conf.in ns5/named.conf
+cp ns5/named2.conf ns5/named.conf
 echo_i "start ns5"
 start_server --noclean --restart --port ${PORT} ns5
 
@@ -342,7 +342,7 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "checking a warning is logged if max-clients-per-query < clients-per-query ($n)"
 ret=0
-copy_setports ns5/named3.conf.in ns5/named.conf
+cp ns5/named3.conf ns5/named.conf
 rndc_reconfig ns5 10.53.0.5
 wait_for_message ns5/named.run "configured clients-per-query (10) exceeds max-clients-per-query (5); automatically adjusting max-clients-per-query to (10)" || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi

diff --git a/bin/tests/system/geoip2/ns2/named1.conf.in b/bin/tests/system/geoip2/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named1.conf.in
rename to bin/tests/system/geoip2/ns2/named.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named10.conf.in b/bin/tests/system/geoip2/ns2/named10.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named10.conf.in
rename to bin/tests/system/geoip2/ns2/named10.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named11.conf.in b/bin/tests/system/geoip2/ns2/named11.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named11.conf.in
rename to bin/tests/system/geoip2/ns2/named11.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named12.conf.in b/bin/tests/system/geoip2/ns2/named12.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named12.conf.in
rename to bin/tests/system/geoip2/ns2/named12.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named2.conf.in b/bin/tests/system/geoip2/ns2/named2.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named2.conf.in
rename to bin/tests/system/geoip2/ns2/named2.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named3.conf.in b/bin/tests/system/geoip2/ns2/named3.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named3.conf.in
rename to bin/tests/system/geoip2/ns2/named3.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named4.conf.in b/bin/tests/system/geoip2/ns2/named4.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named4.conf.in
rename to bin/tests/system/geoip2/ns2/named4.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named5.conf.in b/bin/tests/system/geoip2/ns2/named5.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named5.conf.in
rename to bin/tests/system/geoip2/ns2/named5.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named6.conf.in b/bin/tests/system/geoip2/ns2/named6.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named6.conf.in
rename to bin/tests/system/geoip2/ns2/named6.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named7.conf.in b/bin/tests/system/geoip2/ns2/named7.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named7.conf.in
rename to bin/tests/system/geoip2/ns2/named7.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named8.conf.in b/bin/tests/system/geoip2/ns2/named8.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named8.conf.in
rename to bin/tests/system/geoip2/ns2/named8.conf.j2

diff --git a/bin/tests/system/geoip2/ns2/named9.conf.in b/bin/tests/system/geoip2/ns2/named9.conf.j2
similarity index 100%
rename from bin/tests/system/geoip2/ns2/named9.conf.in
rename to bin/tests/system/geoip2/ns2/named9.conf.j2

diff --git a/bin/tests/system/geoip2/setup.sh b/bin/tests/system/geoip2/setup.sh
index b9ec49f29d123144e5997bdc68706d807a3c8afd..f3acf988c5d9d6235a7a4c8f93bf0236b85854a6 100644 (file)
--- a/bin/tests/system/geoip2/setup.sh
+++ b/bin/tests/system/geoip2/setup.sh
@@ -13,8 +13,6 @@
 
 . ../conf.sh
 
-copy_setports ns2/named1.conf.in ns2/named.conf
-
 for i in 1 2 3 4 5 6 7 other bogus; do
   cp ns2/example.db.in ns2/example${i}.db
   echo "@ IN TXT \"$i\"" >>ns2/example$i.db

diff --git a/bin/tests/system/geoip2/tests.sh b/bin/tests/system/geoip2/tests.sh
index ac1df74ac07069917a2d3ac776556b299a998d1a..a8e8845a41b72aad1ed54440c5fe68701c4c0de2 100644 (file)
--- a/bin/tests/system/geoip2/tests.sh
+++ b/bin/tests/system/geoip2/tests.sh
@@ -75,7 +75,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named2.conf.in ns2/named.conf
+cp ns2/named2.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -113,7 +113,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named3.conf.in ns2/named.conf
+cp ns2/named3.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -151,7 +151,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named4.conf.in ns2/named.conf
+cp ns2/named4.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -191,7 +191,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named5.conf.in ns2/named.conf
+cp ns2/named5.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -232,7 +232,7 @@ fi
 
 n=$((n + 1))
 echo_i "reloading server"
-copy_setports ns2/named6.conf.in ns2/named.conf
+cp ns2/named6.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -270,7 +270,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named7.conf.in ns2/named.conf
+cp ns2/named7.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -308,7 +308,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named8.conf.in ns2/named.conf
+cp ns2/named8.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -346,7 +346,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named9.conf.in ns2/named.conf
+cp ns2/named9.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -384,7 +384,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named10.conf.in ns2/named.conf
+cp ns2/named10.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -422,7 +422,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named11.conf.in ns2/named.conf
+cp ns2/named11.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3
@@ -460,7 +460,7 @@ else
 fi
 
 echo_i "reloading server"
-copy_setports ns2/named12.conf.in ns2/named.conf
+cp ns2/named12.conf ns2/named.conf
 $CHECKCONF ns2/named.conf | cat_i
 rndc_reload ns2 10.53.0.2
 sleep 3

diff --git a/bin/tests/system/inline/ns1/named.conf.in b/bin/tests/system/inline/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns1/named.conf.in
rename to bin/tests/system/inline/ns1/named.conf.j2

diff --git a/bin/tests/system/inline/ns2/named.conf.in b/bin/tests/system/inline/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns2/named.conf.in
rename to bin/tests/system/inline/ns2/named.conf.j2

diff --git a/bin/tests/system/inline/ns3/named.conf.in b/bin/tests/system/inline/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns3/named.conf.in
rename to bin/tests/system/inline/ns3/named.conf.j2

diff --git a/bin/tests/system/inline/ns4/named.conf.in b/bin/tests/system/inline/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns4/named.conf.in
rename to bin/tests/system/inline/ns4/named.conf.j2

diff --git a/bin/tests/system/inline/ns5/named.conf.pre b/bin/tests/system/inline/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns5/named.conf.pre
rename to bin/tests/system/inline/ns5/named.conf.j2

diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named2.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns5/named.conf.post
rename to bin/tests/system/inline/ns5/named2.conf.j2

diff --git a/bin/tests/system/inline/ns6/named.conf.in b/bin/tests/system/inline/ns6/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns6/named.conf.in
rename to bin/tests/system/inline/ns6/named.conf.j2

diff --git a/bin/tests/system/inline/ns7/named.conf.in b/bin/tests/system/inline/ns7/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns7/named.conf.in
rename to bin/tests/system/inline/ns7/named.conf.j2

diff --git a/bin/tests/system/inline/ns8/named.conf.in b/bin/tests/system/inline/ns8/named.conf.j2
similarity index 100%
rename from bin/tests/system/inline/ns8/named.conf.in
rename to bin/tests/system/inline/ns8/named.conf.j2

diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index b832c20350d7fcc5cce8d73ed21f650e0b42bcf5..c1b38e860639722eab4a7a3362ac8df18fe23918 100644 (file)
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@@ -38,15 +38,7 @@ mkdir ns3/removedkeys
 touch ns4/trusted.conf
 cp ns4/noixfr.db.in ns4/noixfr.db
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
 cp ns3/delayedkeys.conf.1 ns3/delayedkeys.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.pre ns5/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf
-copy_setports ns8/named.conf.in ns8/named.conf
 
 (
   cd ns3

diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index a476513bd509a9609bda936e97c2f1c235645946..eb1f54a2bea2c508522965644f953d59bd23e70e 100755 (executable)
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -629,7 +629,7 @@ grep "status: NOERROR" dig.out.ns5.test$n >/dev/null || ret=1
 grep "ANSWER: 1," dig.out.ns5.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "setup broken"; fi
 status=$((status + ret))
-copy_setports ns5/named.conf.post ns5/named.conf
+cp ns5/named2.conf ns5/named.conf
 (
   cd ns5
   $KEYGEN -q -a ${DEFAULT_ALGORITHM} bits

diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/masterformat/ns1/named.conf.in
rename to bin/tests/system/masterformat/ns1/named.conf.j2

diff --git a/bin/tests/system/masterformat/ns2/named.conf.in b/bin/tests/system/masterformat/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/masterformat/ns2/named.conf.in
rename to bin/tests/system/masterformat/ns2/named.conf.j2

diff --git a/bin/tests/system/masterformat/ns3/named.conf.in b/bin/tests/system/masterformat/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/masterformat/ns3/named.conf.in
rename to bin/tests/system/masterformat/ns3/named.conf.j2

diff --git a/bin/tests/system/masterformat/ns4/named1.conf.in b/bin/tests/system/masterformat/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/masterformat/ns4/named1.conf.in
rename to bin/tests/system/masterformat/ns4/named.conf.j2

diff --git a/bin/tests/system/masterformat/ns4/named2.conf.in b/bin/tests/system/masterformat/ns4/named2.conf.j2
similarity index 100%
rename from bin/tests/system/masterformat/ns4/named2.conf.in
rename to bin/tests/system/masterformat/ns4/named2.conf.j2

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index a09ab63ab129df9028de625fb0f731cbfe77bc6b..2737abc7ed102df2be6002bc49e143a323db5eb1 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -14,11 +14,6 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named1.conf.in ns4/named.conf
-
 cp ns1/example.db ns2/
 cp ns2/formerly-text.db.in ns2/formerly-text.db
 cp ns1/empty.db.in ns1/under-limit.db

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index cbf52157e7406fabb46be1f91716d3a23da95933..c99370b1409a11ea617abf0e6760d79718e2189d 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -399,7 +399,7 @@ status=$((status + ret))
 # Reconfigure ns4
 echo_i "reconfigure ns4"
 stop_server ns4
-copy_setports ns4/named2.conf.in ns4/named.conf
+cp ns4/named2.conf ns4/named.conf
 # Recompile zone
 $CHECKZONE -D -F raw -o ns4/kasp.db.raw kasp-max-types-per-name ns4/template.db >/dev/null 2>&1
 start_server --noclean --restart --port "${PORT}" ns4

diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns1/named1.conf.in
rename to bin/tests/system/mkeys/ns1/named.conf.j2

diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns1/named2.conf.in
rename to bin/tests/system/mkeys/ns1/named2.conf.j2

diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns1/named3.conf.in
rename to bin/tests/system/mkeys/ns1/named3.conf.j2

diff --git a/bin/tests/system/mkeys/ns2/named.conf.in b/bin/tests/system/mkeys/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns2/named.conf.in
rename to bin/tests/system/mkeys/ns2/named.conf.j2

diff --git a/bin/tests/system/mkeys/ns3/named.conf.in b/bin/tests/system/mkeys/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns3/named.conf.in
rename to bin/tests/system/mkeys/ns3/named.conf.j2

diff --git a/bin/tests/system/mkeys/ns4/named.conf.in b/bin/tests/system/mkeys/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns4/named.conf.in
rename to bin/tests/system/mkeys/ns4/named.conf.j2

diff --git a/bin/tests/system/mkeys/ns5/named.conf.in b/bin/tests/system/mkeys/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns5/named.conf.in
rename to bin/tests/system/mkeys/ns5/named.conf.j2

diff --git a/bin/tests/system/mkeys/ns6/named.conf.in b/bin/tests/system/mkeys/ns6/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns6/named.conf.in
rename to bin/tests/system/mkeys/ns6/named.conf.j2

diff --git a/bin/tests/system/mkeys/ns7/named.conf.in b/bin/tests/system/mkeys/ns7/named.conf.j2
similarity index 100%
rename from bin/tests/system/mkeys/ns7/named.conf.in
rename to bin/tests/system/mkeys/ns7/named.conf.j2

diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index 4b5e752afd52211717163756cb4427cb13990e38..d9ccb2f312788051826e8d03fd8a1a72d4b006d1 100644 (file)
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -17,14 +17,6 @@ export ALGORITHM_SET="ecc_default"
 
 . ../conf.sh
 
-copy_setports ns1/named1.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf
-
 cp ns5/named1.args ns5/named.args
 
 (cd ns1 && $SHELL sign.sh)

diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index 952667df758df404ec3e2be5d6914f6fb8ec726f..7e7253a6af9cbc6d806c4346c2c30cb40a3eb0d6 100644 (file)
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -497,7 +497,7 @@ $SETTIME -D now -K ns1 "$standby1" >/dev/null
 $SETTIME -D now -K ns1 "$standby2" >/dev/null
 sleep 1 # ensure modification time changes
 $SIGNER -Sg -K ns1 -N unixtime -o . ns1/root.db >/dev/null 2>/dev/null
-copy_setports ns1/named2.conf.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rm -f ns1/root.db.signed.jnl
 mkeys_reconfig_on 1 || ret=1
 mkeys_reload_on 1 || ret=1
@@ -811,7 +811,7 @@ grep "flags:.*ad.*QUERY" dig.out.ns5.a.test$n >/dev/null && ret=1
 grep "example..*.RRSIG..*TXT" dig.out.ns5.a.test$n >/dev/null && ret=1
 grep "status: SERVFAIL" dig.out.ns5.a.test$n >/dev/null || ret=1
 # Allow queries from ns5 to ns1
-copy_setports ns1/named3.conf.in ns1/named.conf
+cp ns1/named3.conf ns1/named.conf
 rm -f ns1/root.db.signed.jnl
 nextpart ns5/named.run >/dev/null
 mkeys_reconfig_on 1 || ret=1

diff --git a/bin/tests/system/reclimit/ns1/named.conf.in b/bin/tests/system/reclimit/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns1/named.conf.in
rename to bin/tests/system/reclimit/ns1/named.conf.j2

diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns3/named1.conf.in
rename to bin/tests/system/reclimit/ns3/named.conf.j2

diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns3/named2.conf.in
rename to bin/tests/system/reclimit/ns3/named2.conf.j2

diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns3/named3.conf.in
rename to bin/tests/system/reclimit/ns3/named3.conf.j2

diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns3/named4.conf.in
rename to bin/tests/system/reclimit/ns3/named4.conf.j2

diff --git a/bin/tests/system/reclimit/ns3/named5.conf.in b/bin/tests/system/reclimit/ns3/named5.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns3/named5.conf.in
rename to bin/tests/system/reclimit/ns3/named5.conf.j2

diff --git a/bin/tests/system/reclimit/ns3/named6.conf.in b/bin/tests/system/reclimit/ns3/named6.conf.j2
similarity index 100%
rename from bin/tests/system/reclimit/ns3/named6.conf.in
rename to bin/tests/system/reclimit/ns3/named6.conf.j2

diff --git a/bin/tests/system/reclimit/setup.sh b/bin/tests/system/reclimit/setup.sh
index bec8fe0ed0b07ae0a9249749960fc682aefcf4b9..f39fd457c4bc87c6fbd3e3d91730ed7a5a2081f4 100644 (file)
--- a/bin/tests/system/reclimit/setup.sh
+++ b/bin/tests/system/reclimit/setup.sh
@@ -13,9 +13,6 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-
 sed -e s/big[.]/signed./g <ns1/big.db >ns1/signed.db
 $KEYGEN -K ns1 -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -f KSK signed >/dev/null 2>&1
 $KEYGEN -K ns1 -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" signed >/dev/null 2>&1

diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh
index 76889eca4cd7eee655473b0063d78806eaa816e5..10ef4c34b1eed5a51765bdc59915e117b9b2b51c 100644 (file)
--- a/bin/tests/system/reclimit/tests.sh
+++ b/bin/tests/system/reclimit/tests.sh
@@ -23,7 +23,6 @@ status=0
 n=0
 
 ns3_reset() {
-  copy_setports $1 ns3/named.conf
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reconfig 2>&1 | sed 's/^/I:ns3 /'
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush | sed 's/^/I:ns3 /'
 }
@@ -87,7 +86,7 @@ echo_i "attempt permissible lookup ($n)"
 ret=0
 echo "12" >ans2/ans.limit
 echo "12" >ans4/ans.limit
-ns3_reset ns3/named1.conf.in
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.4 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect2.example.org >dig.out.1.test$n || ret=1
@@ -104,7 +103,8 @@ n=$((n + 1))
 echo_i "attempt excessive-depth lookup ($n)"
 ret=0
 echo "12" >ans2/ans.limit
-ns3_reset ns3/named2.conf.in
+cp ns3/named2.conf ns3/named.conf
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.4 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect3.example.org >dig.out.1.test$n || ret=1
@@ -120,7 +120,7 @@ echo_i "attempt permissible lookup ($n)"
 ret=0
 echo "5" >ans2/ans.limit
 echo "5" >ans4/ans.limit
-ns3_reset ns3/named2.conf.in
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.4 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect4.example.org >dig.out.1.test$n || ret=1
@@ -138,7 +138,8 @@ echo_i "attempt excessive-queries lookup ($n)"
 ret=0
 echo "13" >ans2/ans.limit
 echo "13" >ans4/ans.limit
-ns3_reset ns3/named3.conf.in
+cp ns3/named3.conf ns3/named.conf
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.4 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect5.example.org >dig.out.1.test$n || ret=1
@@ -159,7 +160,7 @@ n=$((n + 1))
 echo_i "attempt permissible lookup ($n)"
 ret=0
 echo "12" >ans2/ans.limit
-ns3_reset ns3/named3.conf.in
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect6.example.org >dig.out.1.test$n || ret=1
 grep "status: NOERROR" dig.out.1.test$n >/dev/null || ret=1
@@ -178,7 +179,8 @@ n=$((n + 1))
 echo_i "attempt excessive-queries lookup ($n)"
 ret=0
 echo "11" >ans2/ans.limit
-ns3_reset ns3/named4.conf.in
+cp ns3/named4.conf ns3/named.conf
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect7.example.org >dig.out.1.test$n || ret=1
 if ns3_sends_aaaa_queries; then
@@ -197,7 +199,7 @@ n=$((n + 1))
 echo_i "attempt permissible lookup ($n)"
 ret=0
 echo "9" >ans2/ans.limit
-ns3_reset ns3/named4.conf.in
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts @10.53.0.3 indirect8.example.org >dig.out.1.test$n || ret=1
 grep "status: NOERROR" dig.out.1.test$n >/dev/null || ret=1
@@ -213,7 +215,7 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "attempting NS explosion ($n)"
 ret=0
-ns3_reset ns3/named4.conf.in
+ns3_reset
 dig_with_opts @10.53.0.2 reset >/dev/null || ret=1
 dig_with_opts +short @10.53.0.3 ns1.1.example.net >dig.out.1.test$n || ret=1
 dig_with_opts +short @10.53.0.2 count txt >dig.out.2.test$n || ret=1
@@ -239,7 +241,8 @@ wait_for_log 10 "$msg" ns3/named.run || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-ns3_reset ns3/named5.conf.in
+cp ns3/named5.conf ns3/named.conf
+ns3_reset
 dig_with_opts @10.53.0.3 biganswer.big >dig.out.2.test$n || ret=1
 grep 'status: NOERROR' dig.out.2.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -472,7 +475,8 @@ ret=0
 echo_i "checking that lifting the limit will allow everything to get cached ($n)"
 
 # Lift the limit
-ns3_reset ns3/named6.conf.in
+cp ns3/named6.conf ns3/named.conf
+ns3_reset
 
 for ntype in $(seq 65280 65534); do
   check_manytypes 1 manytypes.big "TYPE${ntype}" NOERROR manytypes.big "TYPE${ntype}" 120 || ret=1

diff --git a/bin/tests/system/statschannel/ns1/named.conf.in b/bin/tests/system/statschannel/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/statschannel/ns1/named.conf.in
rename to bin/tests/system/statschannel/ns1/named.conf.j2

diff --git a/bin/tests/system/statschannel/ns2/named.conf.in b/bin/tests/system/statschannel/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/statschannel/ns2/named.conf.in
rename to bin/tests/system/statschannel/ns2/named.conf.j2

diff --git a/bin/tests/system/statschannel/ns2/named2.conf.in b/bin/tests/system/statschannel/ns2/named2.conf.j2
similarity index 100%
rename from bin/tests/system/statschannel/ns2/named2.conf.in
rename to bin/tests/system/statschannel/ns2/named2.conf.j2

diff --git a/bin/tests/system/statschannel/ns3/named.conf.in b/bin/tests/system/statschannel/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/statschannel/ns3/named.conf.in
rename to bin/tests/system/statschannel/ns3/named.conf.j2

diff --git a/bin/tests/system/statschannel/setup.sh b/bin/tests/system/statschannel/setup.sh
index f304fdf496fe2189d7874616d0dc991add286752..09ddcae66d54677b7fbe738740b2cdf662cfda6d 100644 (file)
--- a/bin/tests/system/statschannel/setup.sh
+++ b/bin/tests/system/statschannel/setup.sh
@@ -14,8 +14,4 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-for conf in ns*/named.conf.in; do
-  copy_setports "$conf" "$(dirname "$conf")/$(basename "$conf" .in)"
-done
-
 (cd ns2 && $SHELL sign.sh)

diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index f6816493311ec9286b905ccb50671589c74a5da2..95e7f7e408047ada348de4a4c83ce0d6eb788f34 100644 (file)
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -464,7 +464,7 @@ n=$((n + 1))
 
 # Test sign operations after dnssec-policy change (removing keys).
 ret=0
-copy_setports ns2/named2.conf.in ns2/named.conf
+cp ns2/named2.conf ns2/named.conf
 $RNDCCMD 10.53.0.2 reload 2>&1 | sed 's/^/I:ns2 /'
 # This should trigger the resign of DNSKEY, CDS, and CDNSKEY (+3 ksk),
 # and SOA, NSEC, TYPE65534 (+3 zsk). The dnssec-sign statistics for the

diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/upforwd/ns1/named.conf.in
rename to bin/tests/system/upforwd/ns1/named.conf.j2

diff --git a/bin/tests/system/upforwd/ns2/named.conf.in b/bin/tests/system/upforwd/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/upforwd/ns2/named.conf.in
rename to bin/tests/system/upforwd/ns2/named.conf.j2

diff --git a/bin/tests/system/upforwd/ns3/named1.conf.in b/bin/tests/system/upforwd/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/upforwd/ns3/named1.conf.in
rename to bin/tests/system/upforwd/ns3/named.conf.j2

diff --git a/bin/tests/system/upforwd/ns3/named2.conf.in b/bin/tests/system/upforwd/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/upforwd/ns3/named2.conf.in
rename to bin/tests/system/upforwd/ns3/named2.conf.j2

diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index 2165f7febfcb028534fc10c5893e320d9e968f11..4348e566b25643ff2664dd26bee60494e2f4dde9 100644 (file)
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -17,10 +17,6 @@ cp -f ns1/example1.db ns1/example.db
 cp -f ns1/example3.db.in ns1/example3.db
 cp -f ns3/noprimary.db ns3/noprimary1.db
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-
 if $FEATURETEST --enable-dnstap; then
   cat <<'EOF' >ns3/dnstap.conf
        dnstap-identity "ns3";

diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index 5591aabb67717bfe1237fd85cba3bdb90e4424ee..0db15b13504017d245465f13716bd3038696f6ed 100644 (file)
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -538,7 +538,7 @@ n=$((n + 1))
 ret=0
 echo_i "attempting updates that should exceed quota ($n)"
 # lower the update quota to 1.
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 nextpart ns3/named.run >/dev/null
 for loop in 1 2 3 4 5 6 7 8 9 10; do

diff --git a/bin/tests/system/xfer/ns1/named1.conf.in b/bin/tests/system/xfer/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns1/named1.conf.in
rename to bin/tests/system/xfer/ns1/named.conf.j2

diff --git a/bin/tests/system/xfer/ns1/named2.conf.in b/bin/tests/system/xfer/ns1/named2.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns1/named2.conf.in
rename to bin/tests/system/xfer/ns1/named2.conf.j2

diff --git a/bin/tests/system/xfer/ns1/named3.conf.in b/bin/tests/system/xfer/ns1/named3.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns1/named3.conf.in
rename to bin/tests/system/xfer/ns1/named3.conf.j2

diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns2/named.conf.in
rename to bin/tests/system/xfer/ns2/named.conf.j2

diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns3/named.conf.in
rename to bin/tests/system/xfer/ns3/named.conf.j2

diff --git a/bin/tests/system/xfer/ns4/named.conf.base.in b/bin/tests/system/xfer/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns4/named.conf.base.in
rename to bin/tests/system/xfer/ns4/named.conf.j2

diff --git a/bin/tests/system/xfer/ns6/named.conf.in b/bin/tests/system/xfer/ns6/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns6/named.conf.in
rename to bin/tests/system/xfer/ns6/named.conf.j2

diff --git a/bin/tests/system/xfer/ns7/named.conf.in b/bin/tests/system/xfer/ns7/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns7/named.conf.in
rename to bin/tests/system/xfer/ns7/named.conf.j2

diff --git a/bin/tests/system/xfer/ns8/named.conf.in b/bin/tests/system/xfer/ns8/named.conf.j2
similarity index 100%
rename from bin/tests/system/xfer/ns8/named.conf.in
rename to bin/tests/system/xfer/ns8/named.conf.j2

diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index 49e47ed496d4559469b0160800ff639bb3669784..f10dac34703d2d2fb3e3bd5cca6079b1ebf5b40c 100644 (file)
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -23,15 +23,6 @@ $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 7 >ns7/primary2.db
 cp -f ns4/root.db.in ns4/root.db
 $PERL -e 'for ($i=0;$i<10000;$i++){ printf("x%u 0 in a 10.53.0.1\n", $i);}' >>ns4/root.db
 
-copy_setports ns1/named1.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf
-copy_setports ns8/named.conf.in ns8/named.conf
-
-copy_setports ns4/named.conf.base.in ns4/named.conf
-
 cp ns1/dot-fallback.db.in ns1/dot-fallback.db
 
 cp ns2/sec.db.in ns2/sec.db

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 478141d1882cb1f3dc7181a8f665a821e0520358..a77d0b4bc1e2cd67e5729f5c6022fc7dbb02cf57 100755 (executable)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -688,7 +688,7 @@ status=$((status + tmp))
 
 # Restart ns1 with -T transferslowly
 stop_server ns1
-copy_setports ns1/named2.conf.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 start_server --noclean --restart --port ${PORT} ns1 -- "-D xfer-ns1 $NS_PARAMS -T transferinsecs -T transferslowly"
 sleep 1
 
@@ -733,7 +733,7 @@ status=$((status + tmp))
 
 # Restart ns1 with -T transferstuck
 stop_server ns1
-copy_setports ns1/named3.conf.in ns1/named.conf
+cp ns1/named3.conf ns1/named.conf
 start_server --noclean --restart --port ${PORT} ns1 -- "-D xfer-ns1 $NS_PARAMS -T transferinsecs -T transferstuck"
 sleep 1