summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-12-22 20:49:00 -0500
committerMicah Anderson <micah@riseup.net>2009-12-22 20:49:00 -0500
commit5abd8f38402f08a3cbb544681ca47ff44e4253e6 (patch)
tree6fbc1f3fc8e2955112fe24ce42669133dfe5301b /manifests
parentf868f9fbb4ab6eae2a49212cd7734bda455e812d (diff)
move the munin-kill cronjob into the centos-specific case. this is not something debian needs AFAICT
Diffstat (limited to 'manifests')
-rw-r--r--manifests/host.pp15
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/host.pp b/manifests/host.pp
index 9fd637d..fd70710 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -32,14 +32,15 @@ class munin::host inherits munin
include munin::plugins::muninhost
case $operatingsystem {
- centos: { include munin::host::cgi }
+ centos: {
+ include munin::host::cgi
+ # from time to time we cleanup hanging munin-runs
+ file{'/etc/cron.d/munin_kill':
+ content => "4,34 * * * * root if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi\n",
+ owner => root, group => 0, mode => 0644;
+ }
+ }
}
-
- # from time to time we cleanup hanging munin-runs
- file{'/etc/cron.d/munin_kill':
- content => "4,34 * * * * root if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi\n",
- owner => root, group => 0, mode => 0644;
- }
if $use_shorewall {
include shorewall::rules::out::munin
}