Replace .in with .j2 templates for simple copy_setports cases

Use jinja2 templates instead of *.in templates for named.conf and remove
the copy_setports invocations from setup.sh which are no longer needed.

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

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

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

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

diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh
index 6f52e6526fb6ab3ee59f98093fbf652185553058..59f42848c90011bc87e8c82a23e90dce71b68b32 100644 (file)
--- a/bin/tests/system/chain/setup.sh
+++ b/bin/tests/system/chain/setup.sh
@@ -13,10 +13,5 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf
-
 cd ns2
 $SHELL sign.sh

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

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

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

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

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

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

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

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

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

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

diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh
index 0fc415e997fc535557b8feab5c19caf1e88c7f4f..a6a1881bc9fed8e565139bab5c0ab4c40406258a 100644 (file)
--- a/bin/tests/system/checkds/setup.sh
+++ b/bin/tests/system/checkds/setup.sh
@@ -16,17 +16,6 @@
 
 set -e
 
-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/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
-copy_setports ns8/named.conf.in ns8/named.conf
-copy_setports ns9/named.conf.in ns9/named.conf
-copy_setports ns10/named.conf.in ns10/named.conf
-
 # Setup zones
 (
   cd ns9

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

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

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

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

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

diff --git a/bin/tests/system/cipher-suites/setup.sh b/bin/tests/system/cipher-suites/setup.sh
index 71b94b9fb73a959699891f7bb49edca6b8baf112..5ee800889e91821ad11938eb2d4ee3c2bba755b3 100644 (file)
--- a/bin/tests/system/cipher-suites/setup.sh
+++ b/bin/tests/system/cipher-suites/setup.sh
@@ -20,9 +20,3 @@ $SHELL "${TOP_SRCDIR}/bin/tests/system/genzone.sh" 2 \
     -e '/AMTRELAY.*\# 2 0004/d' \
     -e '/GPOS.*"" "" ""/d' \
     -e '/URI.*30 40 ""/d' >ns1/example.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
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf

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

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

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

diff --git a/bin/tests/system/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh
index 92dd6bf3b2188cab228814c775c99d17b634b7fd..2c9a793f2f27d1b38aa8742debbe172226d5254f 100644 (file)
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -16,8 +16,4 @@
 
 set -e
 
-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
-
 cd ns1 && $SHELL sign.sh

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

diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 2dfa3d65ac2ba6ea95110bcf4588db48121c012a..a5cfb4d96c50ff850d77c99b6861b962fd43345e 100644 (file)
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -14,5 +14,3 @@
 . ../conf.sh
 
 $TSIGKEYGEN ddns-key.example.nil >ns1/ddns.key
-
-copy_setports ns1/named.conf.in ns1/named.conf

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

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

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

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

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

diff --git a/bin/tests/system/doth/setup.sh b/bin/tests/system/doth/setup.sh
index 775dd33a18b79d46a91cb46a186066867d444268..17e991618b5f68558c19a2c4fd16eb0aff76ad8b 100644 (file)
--- a/bin/tests/system/doth/setup.sh
+++ b/bin/tests/system/doth/setup.sh
@@ -25,9 +25,3 @@ while [ $x -le 50 ]; do
   done
   x=$((x + 1))
 done
-
-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/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf

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

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

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

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

diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index 44bcc9d0b4f20ce00691e4d8203464cd2c96b9f9..c162d88a9a47168b7887b2ac3363494e153be70b 100644 (file)
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@@ -13,9 +13,4 @@
 
 . ../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/named.conf.in ns4/named.conf
-
 cd ns1 && $SHELL sign.sh

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

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

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

diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index 89aa024bb76c98239d7517589e39c15788a4a1c6..105624154b9221911270400efa5466c8d0038238 100644 (file)
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -15,9 +15,6 @@ set -e
 
 . ../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
 (
   cd ns1
   $SHELL sign.sh

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

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

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

diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh
index 5d25331aff12d4573847abe9bb7358075c4e2550..9a981de1223a070ae56d16fd3e0224d78945f225 100644 (file)
--- a/bin/tests/system/eddsa/setup.sh
+++ b/bin/tests/system/eddsa/setup.sh
@@ -15,10 +15,6 @@ set -e
 
 . ../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
-
 (
   cd ns1
   $SHELL sign.sh

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

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

diff --git a/bin/tests/system/enginepkcs11/setup.sh b/bin/tests/system/enginepkcs11/setup.sh
index dadace2f20885a16a41d616b80490b1030e5d2b2..0f6cbc693234e5ea8e156933cda6d8cbed2debef 100644 (file)
--- a/bin/tests/system/enginepkcs11/setup.sh
+++ b/bin/tests/system/enginepkcs11/setup.sh
@@ -44,9 +44,6 @@ keyfromlabel() {
   cat keyfromlabel.out.$zone.$id
 }
 
-# Setup ns1.
-copy_setports ns1/named.conf.in ns1/named.conf
-
 mkdir ns1/keys
 
 dir="ns1"
@@ -179,9 +176,6 @@ EOF
   fi
 done
 
-# Setup ns2 (with views).
-copy_setports ns2/named.conf.in ns2/named.conf
-
 mkdir ns2/keys
 
 dir="ns2"

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

diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 6dcede51556d7005bc432f7201e17494c67eddb9..b52cd11ddd46f35693405a552a2cb6b055b95261 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -13,6 +13,4 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-
 (cd ns1 && $SHELL sign.sh)

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

diff --git a/bin/tests/system/host/setup.sh b/bin/tests/system/host/setup.sh
index 15300ed932544f704b70cfd9f562d0bbbd768051..20aff0d0644f80af719c73161befdc5192073f5e 100644 (file)
--- a/bin/tests/system/host/setup.sh
+++ b/bin/tests/system/host/setup.sh
@@ -16,5 +16,3 @@ set -e
 . ../conf.sh
 
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/example.db
-
-copy_setports ns1/named.conf.in ns1/named.conf

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

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

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

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

diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index 5b544411b0ebf321e68d072b0548d47fa87ddc89..97743c2fa60f8776b1197a4b0cf7d05b31466e2f 100644 (file)
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -13,11 +13,6 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/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
-
 # Set up db files for zone "test" - this is a series of four
 # versions of the zone, the second and third having small changes
 # and the fourth having a large one.

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

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

diff --git a/bin/tests/system/journal/setup.sh b/bin/tests/system/journal/setup.sh
index e50cd82f03ad58cf9b179d7035c187f6571576a0..a8f62a3c67bcf23b4d26dd49a51f9a043fb9c294 100644 (file)
--- a/bin/tests/system/journal/setup.sh
+++ b/bin/tests/system/journal/setup.sh
@@ -13,7 +13,6 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
 cp ns1/generic.db.in ns1/changed.db
 cp ns1/changed.ver1.jnl.saved ns1/changed.db.jnl
 
@@ -44,6 +43,5 @@ cp ns1/maxjournal2.jnl.saved ns1/maxjournal2.db.jnl
 cp ns1/managed-keys.bind.in ns1/managed-keys.bind
 $PERL ../fromhex.pl <ns1/managed-keys.bind.jnl.in >ns1/managed-keys.bind.jnl
 
-copy_setports ns2/named.conf.in ns2/named.conf
 cp ns2/managed-keys.bind.in ns2/managed-keys.bind
 cp ns2/managed-keys.bind.jnl.in ns2/managed-keys.bind.jnl

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

diff --git a/bin/tests/system/ksr/setup.sh b/bin/tests/system/ksr/setup.sh
index e200a4d434fd7e452b82f4ed22a3ef755364c4a9..64658b6554aab3a15176248cd1af3b40fc293dc5 100644 (file)
--- a/bin/tests/system/ksr/setup.sh
+++ b/bin/tests/system/ksr/setup.sh
@@ -16,8 +16,6 @@
 
 set -e
 
-copy_setports ns1/named.conf.in ns1/named.conf
-
 (
   cd ns1
   $SHELL setup.sh

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

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

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

diff --git a/bin/tests/system/mirror/setup.sh b/bin/tests/system/mirror/setup.sh
index 134c4ad0c1c541942f22a52cbfc1d6caeb4ecf35..85c39e19cf45119153270b3d1b33bc7121040b00 100644 (file)
--- a/bin/tests/system/mirror/setup.sh
+++ b/bin/tests/system/mirror/setup.sh
@@ -13,10 +13,6 @@
 
 . ../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
-
 (cd ns1 && $SHELL -e sign.sh)
 
 cat ns2/verify-axfr.db.bad.signed >ns2/verify-axfr.db.signed

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

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

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

diff --git a/bin/tests/system/multisigner/setup.sh b/bin/tests/system/multisigner/setup.sh
index 06066bc843ec1c1bdf2e008fc72549b4a41954cf..af724609177e65933f49ef336197457c526f0822 100644 (file)
--- a/bin/tests/system/multisigner/setup.sh
+++ b/bin/tests/system/multisigner/setup.sh
@@ -16,10 +16,6 @@
 
 set -e
 
-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
-
 (
   cd ns3
   $SHELL setup.sh

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

diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh
index 5989f880c991dc74773588f868140e406388e4f9..0820cac45236b0b7c76f4e411eb6300524a34454 100644 (file)
--- a/bin/tests/system/nslookup/setup.sh
+++ b/bin/tests/system/nslookup/setup.sh
@@ -14,5 +14,3 @@
 . ../conf.sh
 
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/example.db
-
-copy_setports ns1/named.conf.in ns1/named.conf

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

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

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

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

diff --git a/bin/tests/system/padding/setup.sh b/bin/tests/system/padding/setup.sh
index eb37490200cb99d66d986fe25b96e82d3eb53ab0..d4d7ad396965309d508a4607c5f9a38eb8e35397 100644 (file)
--- a/bin/tests/system/padding/setup.sh
+++ b/bin/tests/system/padding/setup.sh
@@ -13,9 +13,4 @@
 
 . ../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/named.conf.in ns4/named.conf
-
 touch ns2/named.stats

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

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

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

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

diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index f16857c943a4fc0946fa084075dbb1647cd9d25f..31e0df1743500c6c6abb3922952dd3c098419e1a 100644 (file)
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -13,9 +13,4 @@
 
 . ../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/named.conf.in ns4/named.conf
-
 cd ns1 && $SHELL -e sign.sh

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

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

diff --git a/bin/tests/system/proxy/setup.sh b/bin/tests/system/proxy/setup.sh
index 7857c71ec7a7f3c4cb2f9af4c23e05c63cbb30b2..b737f7b5e8a90cd271cbf604dc56f5de5345d3ad 100644 (file)
--- a/bin/tests/system/proxy/setup.sh
+++ b/bin/tests/system/proxy/setup.sh
@@ -16,6 +16,3 @@
 
 $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db
 $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns3/example.db
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf

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

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

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

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

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

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

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index 5022a8344ddb1c1113457f8b78b82b22cbae6a54..b98c65951788ea1c68cee74f9187ab381cc67f7b 100644 (file)
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -13,13 +13,6 @@
 
 . ../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/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-
 cp ns2/redirect.db.in ns2/redirect.db
 cp ns2/example.db.in ns2/example.db
 (cd ns1 && $SHELL sign.sh)

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

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

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

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

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

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

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

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index 557ec6c9aad7f109cd13f1f3429d41d2147c44af..0328b676c478d9b21ff6062c27f43cc269091cc8 100644 (file)
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -33,14 +33,6 @@ fi
 awk 'END { for (i = 1; i <= '${size}'; i++)
      printf "host%d IN A 10.53.0.6\n", i; }' </dev/null >>ns6/huge.zone.db
 
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns2/secondkey.conf.in ns2/secondkey.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
-
 keyset=
 make_key() {
   $RNDCCONFGEN -k key$1 -A $3 -s 10.53.0.4 -p $2 \

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

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

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

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

diff --git a/bin/tests/system/rootkeysentinel/setup.sh b/bin/tests/system/rootkeysentinel/setup.sh
index 39e1edf41255da0f108b9d8198413a84da378572..f46b11d562e1a928088261d7a44b4ef10ef92b7b 100644 (file)
--- a/bin/tests/system/rootkeysentinel/setup.sh
+++ b/bin/tests/system/rootkeysentinel/setup.sh
@@ -13,10 +13,5 @@
 
 . ../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/named.conf.in ns4/named.conf
-
 cd ns1
 $SHELL sign.sh

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

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

diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index 5ee1f4e1781a26779d9237827ccf2753365a4b89..e2f5b75200383349715b84a7e6004a98acfe1957 100644 (file)
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@@ -13,7 +13,4 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-
 cd ns1 && $SHELL -e sign.sh

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

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

diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh
index 0ff78b71c32da9f2642e9152c0b0cf5f1a6d2019..b8d90a850ca68ca649317c2a525945c5fcdd752a 100644 (file)
--- a/bin/tests/system/sfcache/setup.sh
+++ b/bin/tests/system/sfcache/setup.sh
@@ -16,8 +16,5 @@
 
 set -e
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-
 cd ns1 && $SHELL sign.sh && cd ..
 cd ns5 && $SHELL sign.sh && cd ..

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

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

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

diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index aab7002904a51353cc2d676a4c0f4428af4fcf26..11b37e6d9e150ad51f6dd0efd0a02eef9320071c 100644 (file)
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -19,7 +19,3 @@ cp ns2/zone.template.db ns2/zone000001.example.db
 cp ns2/zone.template.db ns2/zone000002.example.db
 cp ns2/zone.template.db ns2/zone000003.example.db
 cp ns2/zone.template.db ns2/zone000004.example.db
-
-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

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

diff --git a/bin/tests/system/timeouts/setup.sh b/bin/tests/system/timeouts/setup.sh
index 250305486ad3c7fd8c41035b6e62d29dc5e1ea92..0f318626cf5132842bc0102b95365c504551f735 100644 (file)
--- a/bin/tests/system/timeouts/setup.sh
+++ b/bin/tests/system/timeouts/setup.sh
@@ -13,8 +13,6 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-
 #
 # Generate a large enough zone, so the transfer takes longer than
 # tcp-initial-timeout interval

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

diff --git a/bin/tests/system/transport-acl/setup.sh b/bin/tests/system/transport-acl/setup.sh
index c62497b30bf77a6d9c478136350d818e251fd39f..76adad02275250923cb11a960111cc8e7ec207fe 100644 (file)
--- a/bin/tests/system/transport-acl/setup.sh
+++ b/bin/tests/system/transport-acl/setup.sh
@@ -15,5 +15,3 @@
 . ../conf.sh
 
 $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db
-
-copy_setports ns1/named.conf.in ns1/named.conf

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

diff --git a/bin/tests/system/transport-change/setup.sh b/bin/tests/system/transport-change/setup.sh
index c62497b30bf77a6d9c478136350d818e251fd39f..76adad02275250923cb11a960111cc8e7ec207fe 100644 (file)
--- a/bin/tests/system/transport-change/setup.sh
+++ b/bin/tests/system/transport-change/setup.sh
@@ -15,5 +15,3 @@
 . ../conf.sh
 
 $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db
-
-copy_setports ns1/named.conf.in ns1/named.conf

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

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

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

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

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

diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index 8c7adfe1a739b4cfb2abbcf084e950b3c9755336..5cd73e661621c1a3693a8ae8f9e77490f4982d80 100644 (file)
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@@ -13,10 +13,4 @@
 
 . ../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/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-
 (cd ns1 && $SHELL -e sign.sh)

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

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

diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index b352403b8bed294bf798352594aaa1633c04201b..9a41744ff52b7cedb2e7f65c96c7ae7c2fe3f023 100644 (file)
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -20,6 +20,3 @@
 $PYTHON setup.py
 
 cp -f ns1/changing1.db ns1/changing.db
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf

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

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

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

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

diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh
index 794f6a9e03da1ad2cd689f03a35ddfb43261c397..8441bef0f2aff42c2bf041ddf022cca658d515bd 100644 (file)
--- a/bin/tests/system/zero/setup.sh
+++ b/bin/tests/system/zero/setup.sh
@@ -13,9 +13,4 @@
 
 . ../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/named.conf.in ns4/named.conf
-
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 4 | sed -e 's/^$TTL 3600$/$TTL 0 ; force TTL to zero/' -e 's/86400.IN SOA/0 SOA/' >ns2/example.db

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

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

diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index 785168632547bdbae1516d4c09e72ef407a35636..12aa07dffe100d0153b073e82f93504ec5f69351 100644 (file)
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -13,9 +13,6 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/primary.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/duplicate.db
 cp bigserial.db ns1/