Use jinja2 templates in autosign test

- Include ns3/nsec-only.conf conditionally and always render it.

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

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

diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.j2
similarity index 99%
rename from bin/tests/system/autosign/ns3/named.conf.in
rename to bin/tests/system/autosign/ns3/named.conf.j2
index f6d061bb0ad8f466e13effbfb54b4123826b8b9a..10208ee0a366f61ccda62ee137955d69c7110393 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.j2
@@ -386,6 +386,8 @@ zone "dname-at-apex-nsec3.example" {
        dnssec-policy nsec3;
 };
 
+{% if RSASHA1_SUPPORTED == "1" %}
 include "nsec-only.conf";
+{% endif %}
 
 include "trusted.conf";

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

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

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

diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 2c785ac245c4855083a4129ed28f1bd551409d12..e8b62740f08cc3b514191258dedffd494993f9f1 100644 (file)
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -13,16 +13,5 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-if [ $RSASHA1_SUPPORTED = 1 ]; then
-  cp ns3/nsec-only.conf.in ns3/nsec-only.conf
-else
-  : >ns3/nsec-only.conf
-fi
-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
-
 echo_i "generating keys and preparing zones"
 cd ns1 && $SHELL keygen.sh