From 60e94ded2bb418c532a25b9fc3a8d05aaf424b40 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 30 May 2009 20:20:54 +0200 Subject: improved enforced munin plugin --- files/plugins/selinuxenforced | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/files/plugins/selinuxenforced b/files/plugins/selinuxenforced index 16a3f66..e157e3d 100755 --- a/files/plugins/selinuxenforced +++ b/files/plugins/selinuxenforced @@ -23,5 +23,8 @@ if [ "$1" = "config" ]; then exit 0 fi -echo -n "enforced.value " && cat /selinux/enforce - +if [ -r /selinux/enforce ]; then + echo -n "enforced.value " && cat /selinux/enforce +else + echo "enforced.value 0" +fi -- cgit v1.2.3 From 3b2bddb45aad52669f1c680ee0b95d4c061a7590 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 1 Jun 2009 21:28:22 +0200 Subject: add cronjob to kill hanging munin-runs --- manifests/host.pp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manifests/host.pp b/manifests/host.pp index fdaa255..b23a7e5 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -34,6 +34,12 @@ class munin::host case $operatingsystem { centos: { include munin::host::cgi } } + + # from time to time we cleanup hanging munin-runs + file{'/etc/cront.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; + } } class munin::host::cgi { -- cgit v1.2.3 From 11ff5755c2ee3929b4422a8128827a0e9967d964 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 1 Jun 2009 21:28:53 +0200 Subject: fix typo --- manifests/host.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/host.pp b/manifests/host.pp index b23a7e5..21cf7df 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -36,7 +36,7 @@ class munin::host } # from time to time we cleanup hanging munin-runs - file{'/etc/cront.d/munin_kill': + 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; } -- cgit v1.2.3