dsa-check-zone-rrsig-expiration-many: support setting "delegated = no" in zonefiles...

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 4139b0d..cb8c41d 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
+++ b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
@@ -120,15 +120,17 @@ for my $file (sort {$a cmp $b} (readdir INDIR)) {
        next unless ( -f "$file" );
 
        my $do_dnssec = 1;
+       my $delegated = 1;
        my $initial_refs = undef;
        open(F, '<', $file) or die ("Cannot open $file: $!\n");
        for (<F>) {
                if (/^; wzf:\s*dnssec\s*=\s*0\s*$/) { $do_dnssec = 0; }
+               if (/^; delegated\s*=\s*no\s*$/) { $delegated = 0; }
                if (/^; check-initial-refs\s*=\s*(.*?)\s*$/) { $initial_refs = $1; }
        };
        close F;
 
-       if ($do_dnssec) {
+       if ($do_dnssec && $delegated) {
                die "Duplicate zone $file?\n" if exists $dnsseczones{$file};
                $dnsseczones{$file} = {};
                $dnsseczones{$file}->{'initial_refs'} = $initial_refs if defined $initial_refs;

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 8c42142..1071a97 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -30,6 +30,8 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
   * dsa-check-zone-rrsig-expiration: document -r and -s in help output.
   * dsa-check-mirrorsync: support unix timestamps in tracefile
     (for staticsync mirrors).
+  * dsa-check-zone-rrsig-expiration-many: support setting "delegated = no"
+    in zonefiles.  This will skip it being checked.
 
   [ Tollef Fog Heen ]
   * dsa-update-unowned-file-status: ignore fdescfs, used for /dev/fd on
@@ -42,7 +44,7 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
   * Add dsa-check-hpssacli, replaces hpacucli for new hosts.
   * dsa-check-hpssacli: accept 12.0Gbps as transfer speed for SAS
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 15 Jun 2016 10:58:31 +0200
+ -- Peter Palfrader <weasel@debian.org>  Wed, 27 Jul 2016 10:11:45 +0200
 
 dsa-nagios-checks (108) unstable; urgency=medium