mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-11 11:19:59 -04:00
Use jinja2 templates in views test
- Rename named.conf.j2 to named3.conf.j2 and adjust the python test to
render this template.
- Handle the n2 and ns3 multiple configs as in other similar cases
(ns2/named1.conf.in was moved to ns2/named.conf.j2).
(cherry picked from commit 2592f0d961)
This commit is contained in:
parent
765c4f1fd5
commit
19ac916ee1
9 changed files with 3 additions and 9 deletions
|
|
@ -17,12 +17,6 @@ set -e
|
|||
. ../conf.sh
|
||||
|
||||
cp -f ns2/example1.db ns2/example.db
|
||||
|
||||
copy_setports ns1/named.conf.in ns1/named.conf
|
||||
copy_setports ns2/named1.conf.in ns2/named.conf
|
||||
copy_setports ns3/named1.conf.in ns3/named.conf
|
||||
copy_setports ns5/named.conf.in ns5/named.conf
|
||||
|
||||
#
|
||||
# We remove k1 and k2 as KEYGEN is deterministic when given the
|
||||
# same source of "random" data and we want different keys for
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ dig_with_opts a.example. @10.53.0.3 any >dig.out.ns3.1 || status=1
|
|||
echo_i "copying in new configurations for ns2 and ns3"
|
||||
rm -f ns2/named.conf ns3/named.conf ns2/example.db
|
||||
cp -f ns2/example2.db ns2/example.db
|
||||
copy_setports ns2/named2.conf.in ns2/named.conf
|
||||
copy_setports ns3/named2.conf.in ns3/named.conf
|
||||
cp ns2/named2.conf ns2/named.conf
|
||||
cp ns3/named2.conf ns3/named.conf
|
||||
|
||||
echo_i "reloading ns2 and ns3 with rndc"
|
||||
nextpart ns2/named.run >/dev/null
|
||||
|
|
@ -151,7 +151,7 @@ status=$((status + ret))
|
|||
echo_i "verifying adding of multiple inline zones followed by reconfiguration works"
|
||||
|
||||
[ ! -f ns2/zones.conf ] && touch ns2/zones.conf
|
||||
copy_setports ns2/named3.conf.in ns2/named.conf
|
||||
cp ns2/named3.conf ns2/named.conf
|
||||
|
||||
i=1
|
||||
while [ $i -lt 50 ]; do
|
||||
|
|
|
|||
Loading…
Reference in a new issue