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