remove deactive zsk in tests / remove unused bind-dnssec-setup file

diff --git a/regression-tests/bind-dnssec-setup b/regression-tests/bind-dnssec-setup
deleted file mode 100755 (executable)
index 8dac036..0000000
--- a/regression-tests/bind-dnssec-setup
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -ex
-rm -f dnssec.sqlite3
-../pdns/pdnssec --config-dir=. create-bind-db dnssec.sqlite3
-for zone in $(grep zone named.conf  | cut -f2 -d\")
-do
-    if [ "${zone: 0:16}" = "secure-delegated" ]
-    then
-        ../pdns/pdnssec --config-dir=. import-zone-key $zone $zone.key ksk 2>&1
-        ../pdns/pdnssec --config-dir=. add-zone-key $zone 1024 zsk 2>&1
-        keyid=`../pdns/pdnssec --config-dir=. show-zone delegated.dnssec-parent.com | grep ZSK | cut -d' ' -f3`
-        ../pdns/pdnssec --config-dir=. activate-zone-key $zone $keyid 2>&1
-        ../pdns/pdnssec --config-dir=. add-zone-key $zone 1024 zsk 2>&1
-    else
-        ../pdns/pdnssec --config-dir=. secure-zone $zone 2>&1
-    fi
-done

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 088de45f6765348bfda292b29fd800af60285e03..4582eac3eb74dc1d2350dfb0a57e3bc77fa6382d 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -236,7 +236,6 @@ securezone ()
                ../pdns/pdnssec --config-dir=. $configname add-zone-key $zone 1024 zsk 2>&1
                keyid=`../pdns/pdnssec --config-dir=. $configname show-zone $zone | grep ZSK | cut -d' ' -f3`
                ../pdns/pdnssec --config-dir=. $configname activate-zone-key $zone $keyid 2>&1
-               ../pdns/pdnssec --config-dir=. $configname add-zone-key $zone 1024 zsk 2>&1
                ../pdns/pdnssec --config-dir=. $configname rectify-zone $zone 2>&1
        else
                ../pdns/pdnssec --config-dir=. $configname secure-zone $zone 2>&1