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

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index 6f606e371..493b98760 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -9,13 +9,25 @@ class munin::master {
 		require => Package['munin'];
 	}
 
-	if $::hostname == 'menotti' {
-		file { '/etc/munin/munin-conf.d':
-			ensure => directory,
-			mode   => 755,
-			;
-		}
+	ssl::service { 'munin.debian.org':
+		notify  => Exec['service apache2 reload'],
+		key => true,
+	}
+	file { '/etc/munin/munin-conf.d':
+		ensure  => directory,
+		mode    => '0755',
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+	}
+
+	Munin::Master_per_node<<| |>>
+
+	file { '/etc/cron.d/puppet-munin-cleanup': ensure => absent; }
 
-		Munin::Master-per-node<<| |>>
+	concat::fragment { 'dsa-puppet-stuff--munin-master':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		source => 'puppet:///modules/munin/master-cleanup-cron',
 	}
 }