Move the SSL CA check with the other SSL checks and rename it

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 65f096e..dd87c03 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1960,6 +1960,10 @@ services:
     name: "host SSL cert - debian client"
     nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi"
     hostgroups: computers
+  -
+    name: "host SSL cert - CA"
+    nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt"
+    hosts: handel
   -
     name: "sso CRL"
     nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi"
@@ -2909,14 +2913,6 @@ services:
     check_interval: 60
     hosts: vogler
   ####
-  -
-    name: Debian SMTP CA
-    nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt"
-    hosts: handel
-    check_interval: 60
-    max_check_attempts: 2
-    retry_interval: 5
-  ####
   -
     name: puppetmaster cert
     nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"