From e5d7ab2d8f376752de37973a8ea968bf4527afff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= <nicki@isc.org>
Date: Fri, 5 Dec 2025 17:04:25 +0100
Subject: [PATCH] Use jinja2 templates in rpzrecurse test

- Change ns2 header into jinja2 template.
- Keep the various ns2 config files as non-templates, same for the
  named.default.conf to be consistent.
- Symlink the ns2/named.default.conf as a jinja2 template to pick a
  starting config. It is rendered as a template to avoid an error when
  the test would overwrite a git-tracked file.
- Use jinja2 templates for the ns3 files, keep named1.conf around
  because it's needed later in the test to restore the config. Symlink
  it to `ns3/named.conf.j2` to select a default config.

(cherry picked from commit 16e9ac4710fe2463fa0fedaace64f4c374d99dde)
---
 .../rpzrecurse/ns1/{named.conf.in => named.conf.j2}      | 0
 .../ns2/{named.conf.header.in => named.conf.header.j2}   | 0
 bin/tests/system/rpzrecurse/ns2/named.conf.j2            | 1 +
 bin/tests/system/rpzrecurse/ns3/named.conf.j2            | 1 +
 .../rpzrecurse/ns3/{named1.conf.in => named1.conf.j2}    | 0
 .../rpzrecurse/ns3/{named2.conf.in => named2.conf.j2}    | 0
 .../rpzrecurse/ns3/{named3.conf.in => named3.conf.j2}    | 0
 .../rpzrecurse/ns4/{named.conf.in => named.conf.j2}      | 0
 bin/tests/system/rpzrecurse/setup.sh                     | 9 ---------
 bin/tests/system/rpzrecurse/tests.sh                     | 6 +++---
 10 files changed, 5 insertions(+), 12 deletions(-)
 rename bin/tests/system/rpzrecurse/ns1/{named.conf.in => named.conf.j2} (100%)
 rename bin/tests/system/rpzrecurse/ns2/{named.conf.header.in => named.conf.header.j2} (100%)
 create mode 120000 bin/tests/system/rpzrecurse/ns2/named.conf.j2
 create mode 120000 bin/tests/system/rpzrecurse/ns3/named.conf.j2
 rename bin/tests/system/rpzrecurse/ns3/{named1.conf.in => named1.conf.j2} (100%)
 rename bin/tests/system/rpzrecurse/ns3/{named2.conf.in => named2.conf.j2} (100%)
 rename bin/tests/system/rpzrecurse/ns3/{named3.conf.in => named3.conf.j2} (100%)
 rename bin/tests/system/rpzrecurse/ns4/{named.conf.in => named.conf.j2} (100%)

diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/rpzrecurse/ns1/named.conf.in
rename to bin/tests/system/rpzrecurse/ns1/named.conf.j2
diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.j2
similarity index 100%
rename from bin/tests/system/rpzrecurse/ns2/named.conf.header.in
rename to bin/tests/system/rpzrecurse/ns2/named.conf.header.j2
diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.j2 b/bin/tests/system/rpzrecurse/ns2/named.conf.j2
new file mode 120000
index 0000000000..1be181de20
--- /dev/null
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.j2
@@ -0,0 +1 @@
+named.default.conf
\ No newline at end of file
diff --git a/bin/tests/system/rpzrecurse/ns3/named.conf.j2 b/bin/tests/system/rpzrecurse/ns3/named.conf.j2
new file mode 120000
index 0000000000..96e5f1dcd1
--- /dev/null
+++ b/bin/tests/system/rpzrecurse/ns3/named.conf.j2
@@ -0,0 +1 @@
+named1.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.j2
similarity index 100%
rename from bin/tests/system/rpzrecurse/ns3/named1.conf.in
rename to bin/tests/system/rpzrecurse/ns3/named1.conf.j2
diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/rpzrecurse/ns3/named2.conf.in
rename to bin/tests/system/rpzrecurse/ns3/named2.conf.j2
diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.in b/bin/tests/system/rpzrecurse/ns3/named3.conf.j2
similarity index 100%
rename from bin/tests/system/rpzrecurse/ns3/named3.conf.in
rename to bin/tests/system/rpzrecurse/ns3/named3.conf.j2
diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.in b/bin/tests/system/rpzrecurse/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/rpzrecurse/ns4/named.conf.in
rename to bin/tests/system/rpzrecurse/ns4/named.conf.j2
diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index eae07437f5..3fbdda9cfa 100644
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -19,15 +19,6 @@ set -e
 
 $PERL testgen.pl
 
-copy_setports ns1/named.conf.in ns1/named.conf
-
-copy_setports ns2/named.conf.header.in ns2/named.conf.header
-copy_setports ns2/named.default.conf ns2/named.conf
-
-copy_setports ns3/named1.conf.in ns3/named.conf
-
-copy_setports ns4/named.conf.in ns4/named.conf
-
 touch dnsrps.conf
 touch dnsrps.cache
 
diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index ec6b14399d..69d360db43 100644
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -479,7 +479,7 @@ if [ "$MODE" = "native" ]; then
   echo_i "elapsed time $p1 seconds"
 
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
-  copy_setports ns3/named2.conf.in ns3/named.conf
+  cp ns3/named2.conf ns3/named.conf
   nextpart ns3/named.run >/dev/null
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload >/dev/null
   wait_for_log 20 "rpz: policy: reload done" ns3/named.run || ret=1
@@ -498,7 +498,7 @@ if [ "$MODE" = "native" ]; then
 
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
   # restore original named.conf
-  copy_setports ns3/named1.conf.in ns3/named.conf
+  cp ns3/named1.conf ns3/named.conf
   nextpart ns3/named.run >/dev/null
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload >/dev/null
   wait_for_log 20 "rpz: policy: reload done" ns3/named.run || ret=1
@@ -515,7 +515,7 @@ if [ "$MODE" = "native" ]; then
   echo_i "elapsed time $p1 seconds"
 
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
-  copy_setports ns3/named3.conf.in ns3/named.conf
+  cp ns3/named3.conf ns3/named.conf
   nextpart ns3/named.run >/dev/null
   $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload >/dev/null
   wait_for_log 20 "rpz: policy: reload done" ns3/named.run || ret=1