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

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index 4706dfbfb..6d7d2fdc7 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -8,4 +8,26 @@ class munin::master {
 		content => template('munin/munin.conf.erb'),
 		require => Package['munin'];
 	}
+
+	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; }
+
+	concat::fragment { 'puppet-crontab--munin-master':
+		target => '/etc/cron.d/puppet-crontab',
+		source => 'puppet:///modules/munin/master-cleanup-cron',
+	}
 }