aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/sitesummary.cron.daily3
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d27e396..f89f35c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sitesummary (0.0.54) UNRELEASED; urgency=low
* Rewrite how nagios configuration is generated to use a function to
generate each service check.
+ * Do not generate nagios checks that need nrpe configuration by default.
-- Petter Reinholdtsen <pere@debian.org> Sat, 16 Jan 2010 01:39:35 +0100
diff --git a/debian/sitesummary.cron.daily b/debian/sitesummary.cron.daily
index e408a7a..96545ac 100755
--- a/debian/sitesummary.cron.daily
+++ b/debian/sitesummary.cron.daily
@@ -7,6 +7,7 @@ set -e
daylimit=120
makewebreport=/usr/sbin/sitesummary-makewebreport
nodes=/usr/sbin/sitesummary-nodes
+nagiosopts=-r
# Modify this in collector.cfg to /etc/munin/ to automatically replace
# the default munin configuration.
@@ -60,7 +61,7 @@ tmpldir /etc/munin/templates
EOF
fi
- sitesummary-nodes -m
+ sitesummary-nodes -m $nagiosopts
[ -f $MUNINDIR/munin.conf.post ] && cat $MUNINDIR/munin.conf.post