dnssec-killkey
changeset 25 c02caf4e0eb6
parent 22 7229d1c95ea8
child 26 0342c09abf97
--- a/dnssec-killkey	Mon Aug 02 13:45:47 2010 +0200
+++ b/dnssec-killkey	Wed Aug 04 11:27:21 2010 +0200
@@ -1,9 +1,21 @@
 #!/usr/bin/perl -w
 
 use strict;
+use FindBin;
 
+
+# liest die Konfiguration ein
+my @configs = ("$FindBin::Bin/dnstools.conf", "/etc/dnstools.conf");
 my %config;
-open (CONFIG, "dnstools.conf");
+
+for (grep {-f} @configs) {
+        open(CONFIG, $_) or die "Can't open $_: $!\n";
+}
+
+unless (seek(CONFIG,0 ,0 )) {
+        die "Can't open config (searched: @configs)\n"
+}
+
 while (<CONFIG>) {
         chomp;
         s/#.*//;
@@ -23,18 +35,19 @@
 my @auto;
 chomp (my $now_time=`date +%s`);	# aktuelle unixzeit
 
+
 # prueft zonen aus ARGV und loescht das schluesselmaterial
 for (@ARGV) {
         chomp ($zone = `idn --quiet $_`);
 	my $zdir = "$master_dir/$zone";
         if (-e "$master_dir/$zone") {
 
-		if (-e "$zdir/$zone.signed") { unlink $zdir/$zone.signed}
-		if (-e "$zdir/.keycounter") { unlink $zdir/.keycounter}
-		if (-e "$zdir/.index.ksk") { unlink $zdir/.index.ksk}
-		if (-e "$zdir/.index.zsk") { unlink $zdir/.index.zsk}
-		if (-e "$zdir/dsset-$zone.") { unlink $zdir/dsset-$zone.}
-		if (-e "$zdir/keyset-$zone.") { unlink $zdir/keyset-$zone.}
+		if (-e "$zdir/$zone.signed") { unlink "$zdir/$zone.signed"}
+		if (-e "$zdir/.keycounter") { unlink "$zdir/.keycounter"}
+		if (-e "$zdir/.index.ksk") { unlink "$zdir/.index.ksk"}
+		if (-e "$zdir/.index.zsk") { unlink "$zdir/.index.zsk"}
+		if (-e "$zdir/dsset-$zone.") { unlink "$zdir/dsset-$zone."}
+		if (-e "$zdir/keyset-$zone.") { unlink "$zdir/keyset-$zone."}
 
 		for (`ls $master_dir/$zone/K*[key,private]`){ unlink $_}