Merge remote-tracking branch 'github/master'

1 files changed, 5 insertions, 6 deletions

diff --git a/manifests/host.pp b/manifests/host.pp
index 55e28bf..0e5fb01 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -8,7 +8,6 @@ class munin::host(
   $export_tag = 'munin'
 ) {
   package {'munin': ensure => installed, }
-  include concat::setup
 
   Concat::Fragment <<| tag == $export_tag |>>
 
@@ -39,12 +38,12 @@ class munin::host(
   }
 
   # 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',
+  cron { 'munin_kill':
+    command => 'if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi',
+    minute  => ['4', '34'],
+    user    => 'root',
   }
+
   if $munin::host::manage_shorewall {
     include shorewall::rules::out::munin
   }