Revert "Check dnssec signature expiry"

This reverts commit 617df7ab1d3f55e12bd9e7df2fdf4ea78f9af875.

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index e32321d..855cfcb 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -2004,10 +2004,6 @@ services:
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
     hosts: global
-  -
-    name: DNS SEC - signature expiry
-    check: "dsa_check_dnssec"
-    hosts: global
  ############
   -
     name: ping alive check

diff --git a/config/static/checkcommands.cfg b/config/static/checkcommands.cfg
index 1565d0a..8801888 100644 (file)
--- a/config/static/checkcommands.cfg
+++ b/config/static/checkcommands.cfg
@@ -55,10 +55,6 @@ define command{
        command_name    dsa_check_soas_add
        command_line    /usr/lib/nagios/plugins/dsa-check-soas -a "$ARG1$" "$ARG2$"
 }
-define command{
-       command_name    dsa_check_dnssec
-       command_line    /usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d /var/cache/bind/git/domains
-}
 define command{
        command_name    dsa_check_always_ok
        command_line    /bin/echo "Dummy check - always says OK"

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index dab15b0..4f58caf 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -16,13 +16,12 @@ dsa-nagios-checks (8x) unstable; urgency=low
   [ Peter Palfrader ]
   * add dsa-check-zone-rrsig-expiration (therefore recommend
     libnet-dns-sec-perl).
-  * add dsa-check-zone-rrsig-expiration-many.
   * dsa-check-raid-aacraid: properly support beethoven's Adaptec AAC-RAID
     controller with a battery: "ZMM Optimal" is the way it says "optimal".
   * dsa-check-dabackup-server: check /etc/ssh/userkeys/root instead of
     /root/.ssh/authorized_keys.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 14 Feb 2010 23:29:44 +0100
+ -- Peter Palfrader <weasel@debian.org>  Fri, 12 Feb 2010 13:05:12 +0100
 
 dsa-nagios-checks (84) unstable; urgency=low