From b7d5358626f7865d7b8776bd0388f23d42f1249e Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 1 Apr 2019 07:06:03 +0200 Subject: [PATCH] Move the SSL CA check with the other SSL checks and rename it --- config/nagios-master.cfg | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 65f096e..dd87c03 100644 --- 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" -- 2.20.1