X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fmaster.pp;h=493b9876067bf1c246ad20f1cc713d6d122122ea;hb=22f63daee2fb8fd94cf256933f8b6ae4c2c81364;hp=2a01854d17da767f4f83839b0b5519552efa9c59;hpb=1cf55805ae9d1a9cbc8bd935a52d8eea1914f8d4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index 2a01854d1..493b98760 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -10,7 +10,8 @@ class munin::master {
 	}
 
 	ssl::service { 'munin.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
+		key => true,
 	}
 	file { '/etc/munin/munin-conf.d':
 		ensure  => directory,
@@ -21,5 +22,12 @@ class munin::master {
 		source  => 'puppet:///files/empty/',
 	}
 
-	Munin::Master-per-node<<| |>>
+	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',
+	}
 }