add bind slave to start-test-stop

diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore
index 251a16a035ace1a9e37cbc599b05f39c71ddec7d..48dd9087f3f4dbc738bfedff3e78873194ab13ea 100644 (file)
--- a/regression-tests/.gitignore
+++ b/regression-tests/.gitignore
@@ -37,3 +37,4 @@ real_result
 /*.bind
 /dsset-*
 /bind.conf
+/bind-slave.conf

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 39663c8ae835d99b06b2a66b0307de4b4af58549..eb0829e7dbeb8acd9a1a234ffdfeb5db5aa04f06 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -28,6 +28,9 @@ tonsd ()
 server:
        ip-address: 127.0.0.1@$port
        database: ./nsd.db
+       difffile: ./ixfr.db
+       xfrdfile: ./ixfr.state
+
        zonesdir: .
        username: ""
 
@@ -418,7 +421,7 @@ case $context in
                                        skipreasons="bind optout nodyndns"
                                        ;;
                        esac
-                       named -c bind.conf -f &
+                       named -c bind.conf -g &
                        sleep 5
                        ;;
 
@@ -921,7 +924,7 @@ check_process
 startslave ()
 {
        skipreasons="$skipreasons presigned nodyndns"
-       if [ ${presignedcontext:0:6} = gmysql ] || [ ${presignedcontext:0:7} = ext-nsd ] || [ ${presignedcontext:0:8} = ext-bind ]
+       if [ ${presignedcontext:0:6} = gmysql ]
        then
                context=${context}-presigned
                [ -z "$GMYSQL2DB" ] && GMYSQL2DB=pdnstest2
@@ -1062,10 +1065,10 @@ startslave ()
                        --cache-ttl=$cachettl --no-config --bind-dnssec-db=./dnssec-slave.sqlite3 &
                echo 'waiting for zones to be loaded'
                bindwait bind-slave
-       elif [ ${presignedcontext:0:3} = nsd ]
+       elif [ ${presignedcontext:0:7} = ext-nsd ]
        then
                skipreasons="$skipreasons nsd"
-               context=nsd-presigned
+               context=$context-presigned
                cat > nsd-slave.conf << __EOF__
 server:
        ip-address: 127.0.0.1@$((port+100))
@@ -1111,6 +1114,49 @@ __EOF__
 
                nsd -c nsd-slave.conf -P pdns-slave.pid -d &
                sleep 20
+       elif [ ${presignedcontext:0:8} = ext-bind ]
+       then
+               skipreasons="$skipreasons bind"
+               context=$context-presigned
+               cat > bind-slave.conf << __EOF__
+options {
+       dnssec-enable yes;
+       listen-on port $(($port+100)) { 127.0.0.1; };
+       minimal-responses yes;
+       pid-file "pdns-slave.pid";
+};
+
+key test {
+       algorithm $ALGORITHM;
+       secret "$KEY";
+};
+__EOF__
+
+               rm -f ixfr-slave.db
+               rm -f ixfr-slave.state
+
+               for zone in $(grep zone named.conf  | cut -f2 -d\")
+               do
+                       rm -f $zone-slave
+
+                       echo "" >> bind-slave.conf
+                       echo "zone \"${zone}\" {" >> bind-slave.conf
+                       echo "  type slave;" >> bind-slave.conf
+                       echo "  file \"${zone}-slave\";" >> bind-slave.conf
+                       if [ "${zone}" = "tsig.com" ]
+                       then
+                               echo "  masters port $port { 127.0.0.1 key test; };" >> bind-slave.conf
+                               echo "  allow-transfer { key test; none; };" >> bind-slave.conf
+                       else
+                               echo "  masters port $port { 127.0.0.1; };" >> bind-slave.conf
+                       fi
+                       echo "};" >> bind-slave.conf
+               done
+
+               port=$((port+100))
+
+               named -c bind-slave.conf -g &
+               sleep 20
        fi
 }