X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fmaster.pp;h=493b9876067bf1c246ad20f1cc713d6d122122ea;hb=8a2ead3c6f7a440c891891571a0203c7f9b254f7;hp=ca221b8e481c44a429bfd34bd86b4ae2aa8863a6;hpb=4bbb026dd9e39444192456c5f248a791a25954b4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index ca221b8e4..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,9 +22,12 @@ class munin::master {
 		source  => 'puppet:///files/empty/',
 	}
 
-	Munin::Master-per-node<<| |>>
+	Munin::Master_per_node<<| |>>
 
-	file { '/etc/cron.d/puppet-munin-cleanup':
+	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',
 	}
 }