diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | nagios-templates.cfg | 6 | ||||
| -rwxr-xr-x | sitesummary-nodes | 5 |
3 files changed, 1 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 62e3197..1f0a514 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,6 @@ sitesummary (0.0.68+nmu1) UNRELEASED; urgency=low [ Petter Reinholdtsen ] * Make Nagios configuration for the CUPS check more robust. Require both cups and cups-client packages installed to enable it. - * Add LDAP protocol check to Nagios configuration (simple search for - root attributes) for machines with slapd installed. * Change Standards-Version from 3.9.1 to 3.9.2. No changes needed. * Add Catalan translation from Sergi Casbas (Closes: #609714). diff --git a/nagios-templates.cfg b/nagios-templates.cfg index 251b903..36f59d6 100644 --- a/nagios-templates.cfg +++ b/nagios-templates.cfg @@ -224,12 +224,6 @@ define command{ } define command{ - command_name check_ldap - command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' -} - - -define command{ command_name check_kernel_status command_line /usr/bin/perl /usr/lib/sitesummary/nagios-plugins/check_kernel_status } diff --git a/sitesummary-nodes b/sitesummary-nodes index 0ed7960..2ff9e37 100755 --- a/sitesummary-nodes +++ b/sitesummary-nodes @@ -304,7 +304,7 @@ sub generate_nagios_config { my %tcpservices = ( 139 => { name => 'samba', package => 'samba' }, -# 389 => { name => 'ldap', package => 'slapd' }, + 389 => { name => 'ldap', package => 'slapd' }, 4949 => { name => 'munin', package => 'munin-node' }, ); @@ -485,9 +485,6 @@ sub generate_nagios_config { # check LDAP and LDAPS using the protocol, module present in # nagios-plugins-basic - print_nagios_service_check(0, $hostname, "ldap", - "check_ldap", "''") - if is_pkg_installed($hostid, "slapd"); # Check Squid web proxy print_nagios_service_check($remote, $hostname, "squid", |