dsa-check-config: retire ldap.conf check - we ship it with puppet nowadays anyway.

diff --git a/dsa-nagios-checks/checks/dsa-check-config b/dsa-nagios-checks/checks/dsa-check-config
index d4b845d..2772994 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-config
+++ b/dsa-nagios-checks/checks/dsa-check-config
@@ -40,23 +40,6 @@ check_aliases() {
        log warn "debian-admin not found in root entry in aliases"
 }
 
-check_ldap_conf() {
-       if ! [ -e /etc/ldap/ldap.conf ]; then
-               log unknown "/etc/ldap/ldap.conf not found"
-               return
-       fi
-
-       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/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
-       fi
-
-       log warn "ldap.conf does not have URI, BASE, TLS_CACERT, TLS_REQCERT all configured correctly"
-}
-
 check_ssh_hostkeys() {
        if [ -e /etc/ssh/ssh_host_ed25519_key ] ; then
                if ! [ -e /etc/ssh/ssh_host_ed25519_key.pub ]; then
@@ -88,7 +71,6 @@ check_ipv6_dad() {
 
 
 check_aliases
-check_ldap_conf
 check_ssh_hostkeys
 check_ipv6_dad
 

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 78fc3a0..f6e64e2 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -4,8 +4,10 @@ dsa-nagios-checks (108) UNRELEASED; urgency=medium
   * dsa-check-dabackup: Fix regex as rsync now adds thousands separator on its
       numbers.
   * dsa-check-config: check for DAD failures.
+  * dsa-check-config: retire ldap.conf check - we ship it with puppet
+      nowadays anyway.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 17 May 2015 11:57:06 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 31 May 2015 19:16:01 +0200
 
 dsa-nagios-checks (107) unstable; urgency=medium