X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fmaster.pp;h=6d7d2fdc78b6ce4803d49f3dce7a5844c8fe8906;hb=2cdec8fac4eb9511d0e7d1a01523066cbd9d13f6;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..6d7d2fdc7 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 { 'puppet-crontab--munin-master':
+		target => '/etc/cron.d/puppet-crontab',
+		source => 'puppet:///modules/munin/master-cleanup-cron',
+	}
 }