diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | sitesummary-nodes | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8b95e9a..16b0aab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ sitesummary (0.0.68+nmu1) UNRELEASED; urgency=low + [ Andreas B. Mundt ] * Add '-w' and 'use strict;' to nagios-plugins/check_kernel_status. Modify code to get rid of warnings (i.e. add 'my'). + [ Petter Reinholdtsen ] + * Make CUPS check more robust. Require both cups and cups-client + packages installed to enable it. + -- Andreas B. Mundt <andi.mundt@web.de> Thu, 16 Jun 2011 20:33:54 +0200 sitesummary (0.0.68) unstable; urgency=low diff --git a/sitesummary-nodes b/sitesummary-nodes index 4eaeb65..2ff9e37 100755 --- a/sitesummary-nodes +++ b/sitesummary-nodes @@ -347,7 +347,8 @@ sub generate_nagios_config { print_nagios_service_check(0, $hostname, "cups queue", "check_cups_queue") - if (is_pkg_installed($hostid, "cups")); + if (is_pkg_installed($hostid, "cups") && + is_pkg_installed($hostid, "cups-client")); # The rest of the checks only work if NRPE is installed and configured next unless ((!$remote && $nagiosclient) @@ -482,7 +483,8 @@ sub generate_nagios_config { # check hw raid status # check hardware status - # check LDAP and LDAPS using the protocol + # check LDAP and LDAPS using the protocol, module present in + # nagios-plugins-basic # Check Squid web proxy print_nagios_service_check($remote, $hostname, "squid", |