projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dsa-check-zone-rrsig-expiration* updates
[mirror/dsa-nagios.git]
/
dsa-nagios-checks
/
checks
/
dsa-check-zone-rrsig-expiration-many
diff --git
a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
index
c411e4e
..
397bb83
100755
(executable)
--- a/
dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
+++ b/
dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
@@
-116,13
+116,12
@@
opendir INDIR, '.' or die ("Cannot opendir $INDIR\n");
for my $file (sort {$a cmp $b} (readdir INDIR)) {
next if ( -l "$file" );
next unless ( -f "$file" );
for my $file (sort {$a cmp $b} (readdir INDIR)) {
next if ( -l "$file" );
next unless ( -f "$file" );
- next if $file =~ /^(dsset|keyset)-/;
- my $do_dnssec =
0
;
+ my $do_dnssec =
1
;
my $initial_refs = undef;
open(F, '<', $file) or die ("Cannot open $file: $!\n");
for (<F>) {
my $initial_refs = undef;
open(F, '<', $file) or die ("Cannot open $file: $!\n");
for (<F>) {
- if (/^; wzf:\s*dnssec\s*=\s*
1\s*$/) { $do_dnssec = 1
; }
+ if (/^; wzf:\s*dnssec\s*=\s*
0\s*$/) { $do_dnssec = 0
; }
if (/^; check-initial-refs\s*=\s*(.*?)\s*$/) { $initial_refs = $1; }
};
close F;
if (/^; check-initial-refs\s*=\s*(.*?)\s*$/) { $initial_refs = $1; }
};
close F;
@@
-144,18
+143,9
@@
if (defined $params->{'geozonedir'}) {
for my $file (sort {$a cmp $b} (readdir INDIR)) {
next unless $file =~ /\.zone$/;
for my $file (sort {$a cmp $b} (readdir INDIR)) {
next unless $file =~ /\.zone$/;
- open (F, '<', $file) or die "Cannot open $file: $!\n";
- my ($zc, undef, undef) = Load(join "", (<F>));
- close F;
-
my $zone = basename($file, '.zone');
my $zone = basename($file, '.zone');
-
- if ($zc->{'dnssec'}) {
- die "Duplicate zone $zone?\n" if exists $dnsseczones{$zone};
- $dnsseczones{$zone} = {};
- } else {
- push @{$count->{'unsigned'}}, $zone;
- };
+ die "Duplicate zone $zone?\n" if exists $dnsseczones{$zone};
+ $dnsseczones{$zone} = {};
}
closedir(INDIR);
}
}
closedir(INDIR);
}