further tidying of primary/secondary terminology in system tests
this changes most visble uses of master/slave terminology in tests.sh and most uses of 'type master' or 'type slave' in named.conf files. files in the checkconf test were not updated in order to confirm that the old syntax still works. rpzrecurse was also left mostly unchanged to avoid interference with DNSRPS.
This commit is contained in:
@@ -16,15 +16,15 @@ $SHELL clean.sh
|
||||
copy_setports ns1/named.conf.in ns1/named.conf
|
||||
copy_setports ns2/named.conf.in ns2/named.conf
|
||||
|
||||
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/master.db
|
||||
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/primary.db
|
||||
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/duplicate.db
|
||||
cp bigserial.db ns1/
|
||||
cd ns1
|
||||
touch master.db.signed
|
||||
echo '$INCLUDE "master.db.signed"' >> master.db
|
||||
$KEYGEN -a rsasha256 -q master.example > /dev/null 2>&1
|
||||
$KEYGEN -a rsasha256 -qfk master.example > /dev/null 2>&1
|
||||
$SIGNER -SD -o master.example master.db > /dev/null \
|
||||
touch primary.db.signed
|
||||
echo '$INCLUDE "primary.db.signed"' >> primary.db
|
||||
$KEYGEN -a rsasha256 -q primary.example > /dev/null 2>&1
|
||||
$KEYGEN -a rsasha256 -qfk primary.example > /dev/null 2>&1
|
||||
$SIGNER -SD -o primary.example primary.db > /dev/null \
|
||||
2> signer.err || cat signer.err
|
||||
echo '$INCLUDE "soa.db"' > reload.db
|
||||
echo '@ 0 NS .' >> reload.db
|
||||
|
||||
Reference in New Issue
Block a user