From: Nicki Křížek <nicki@isc.org>
Date: Tue, 9 Dec 2025 08:54:12 +0000 (+0100)
Subject: Use jinja2 templates in autosign test
X-Git-Tag: v9.21.17~46^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bd0d689ac14500e1910829586e5654f8d96b74;p=thirdparty%2Fbind9.git

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 f6d061bb0ad..10208ee0a36 100644
--- 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 2c785ac245c..e8b62740f08 100644
--- 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