move clone-zone into the pdnssec era

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1890 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dnssec-scripts/clone-zone b/pdns/dnssec-scripts/clone-zone
index fbc84d40d3bb57c59efc47b710c5cedc0ae92332..6acf5406f0d2ba864d91a174b0c9cd84960948d3 100755 (executable)
--- a/pdns/dnssec-scripts/clone-zone
+++ b/pdns/dnssec-scripts/clone-zone
@@ -3,9 +3,14 @@
 TIMERANGE=$(drill -D @127.0.0.1 -p 5300 powerdnssec.org -t soa | grep RRSIG | head -1 | 
        awk '{printf "-e %s -i %s", $9, $10}')
 
-PLAINZONE=$1
-ZSKID=$(drill -D @127.0.0.1 -p 5300 powerdnssec.org -t soa  | grep RRSIG | cut -f2 -d{ | cut -f1 -d} | awk '{print $3}')
-ZSKFNAME=$(echo /home/ahu/work/pdns/pdns/pdns/keys/$1/keys/000002*zsk.active.private | sed s/.private//)
+drill axfr $1 @127.0.0.1 -p 5300 > $1.zone
+PLAINZONE=$1.zone
+ZSKTAG=$(drill -D @127.0.0.1 -p 5300 powerdnssec.org -t soa  | grep RRSIG | cut -f2 -d{ | cut -f1 -d} | awk '{print $3}')
+ZSKID=$(../pdnssec show-zone powerdnssec.org  | grep "tag = $ZSKTAG," | cut -f3 -d" ")
+../pdnssec export-zone-key powerdnssec.org $ZSKID > key-$ZSKID.private
 
-ldns-signzone $2 $3 $4 $1 $TIMERANGE $ZSKFNAME
-echo Zone signed with key id $ZSKID now in $1.signed
\ No newline at end of file
+ldns-signzone $2 $3 $4 $1 $TIMERANGE key-$ZSKID
+echo Zone signed with key id $ZSKID now in $1.signed
+cp $1.signed /tmp/$1
+sudo nsdc rebuild
+sudo nsdc reload