From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sat, 16 Nov 2013 22:24:54 +0000 (+0100)
Subject: remove deactive zsk in tests / remove unused bind-dnssec-setup file
X-Git-Tag: rec-3.6.0-rc1~342^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0c580846fda56c619909299ed5b28c00ed6a4e6;p=pdns

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
index 8dac036a1..000000000
--- 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 088de45f6..4582eac3e 100755
--- 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