X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fmaster.pp;h=6d7d2fdc78b6ce4803d49f3dce7a5844c8fe8906;hb=93bbb3585dc5f0ec8a28d616001d19065f28a41f;hp=5dc0bbc681a4c4183cfae48c5ce8baf0d590a861;hpb=8e104735c829bddd66c9f0aacfa0f41e92eed57d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index 5dc0bbc68..6d7d2fdc7 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -11,6 +11,7 @@ class munin::master {
 
 	ssl::service { 'munin.debian.org':
 		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 { 'puppet-crontab--munin-master':
+		target => '/etc/cron.d/puppet-crontab',
 		source => 'puppet:///modules/munin/master-cleanup-cron',
 	}
 }