dsa-check-config: Update for new TLS_CACERT config

diff --git a/dsa-nagios-checks/checks/dsa-check-config b/dsa-nagios-checks/checks/dsa-check-config
index 2341d07..4a59c65 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-config
+++ b/dsa-nagios-checks/checks/dsa-check-config
@@ -48,7 +48,7 @@ check_ldap_conf() {
 
        if egrep '^URI.*ldap://db.debian.org' /etc/ldap/ldap.conf > /dev/null &&
           egrep '^BASE.*dc=debian,dc=org' /etc/ldap/ldap.conf > /dev/null &&
-          egrep '^TLS_CACERT.*/etc/ssl/certs/spi-cacert-2008.pem' /etc/ldap/ldap.conf > /dev/null &&
+          egrep '^TLS_CACERT.*/etc/ssl/servicecerts/db.debian.org.crt' /etc/ldap/ldap.conf > /dev/null &&
           egrep '^TLS_REQCERT.*hard' /etc/ldap/ldap.conf > /dev/null ; then
                log ok "ldap.conf configured properly"
                return

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 377b275..51358b6 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,10 +1,11 @@
-dsa-nagios-checks (97) UNRELEASED; urgency=low
+dsa-nagios-checks (97) unstable; urgency=low
 
   [ Stephen Gran ]
   * Update dsa-check-mq-connection to actually work
 
   [ Peter Palfrader ]
   * dsa-check-backuppg: allow BASE backup filenames without the WAL ID.
+  * dsa-check-config: Update for new TLS_CACERT config.
 
  -- Peter Palfrader <weasel@debian.org>  Mon, 27 Jan 2014 22:29:15 +0100