From 37fef292f1c61cb5ca20b60d625310f3150175b0 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Wed, 13 Aug 2014 10:18:04 +0200
Subject: Bump concat dependency to get rid of deprecation warning when
 including concat::setup

---
 manifests/host.pp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'manifests/host.pp')

diff --git a/manifests/host.pp b/manifests/host.pp
index e666c3d..70d7116 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 |>>
 
-- 
cgit v1.2.3


From c39907a4b3acb1413a290b78b3dd3b49b898e210 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Wed, 13 Aug 2014 10:40:45 +0200
Subject: Use cron resource instead of a cron.d file

---
 manifests/host.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests/host.pp')

diff --git a/manifests/host.pp b/manifests/host.pp
index e666c3d..f231691 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -39,12 +39,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
   }
-- 
cgit v1.2.3