From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 25 Dec 2017 10:56:07 +0000 (+0100)
Subject: move munin-master crontab to dsa-puppet-stuff
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7fa8771804c670931b73e7b7b7ca381429a07564;p=mirror%2Fdsa-puppet.git

move munin-master crontab to dsa-puppet-stuff
---

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index d8d227107..aa7934f20 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -25,6 +25,11 @@ class munin::master {
 	Munin::Master_per_node<<| |>>
 
 	file { '/etc/cron.d/puppet-munin-cleanup':
+		ensure => absent;
+	}
+
+	concat::fragment { 'dsa-puppet-stuff--munin-master':
+		target => '/etc/cron.d/dsa-puppet-stuff',
 		source => 'puppet:///modules/munin/master-cleanup-cron',
 	}
 }