X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fmaster.pp;h=17729c7d9c2495982d2203cb6182597877ae2531;hb=HEAD;hp=c097a3e3c7d0258f7041b20a14f029b561e38678;hpb=806b9885875cb9a589ad8f54df0114b12a8e1d4f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index c097a3e3c..17729c7d9 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -1,25 +1,44 @@
+# munin master node
 class munin::master {
+  include apache2
 
-	package { 'munin':
-		ensure => installed
-	}
+  package { 'munin':
+    ensure => installed
+  }
 
-	file { '/etc/munin/munin.conf':
-		content => template('munin/munin.conf.erb'),
-		require => Package['munin'];
-	}
+  ssh::keygen { 'munin' : }
+  ssh::authorized_key_add { 'munin-async-fetcher':
+    target_user => 'munin-async',
+    key         => dig($facts, 'ssh_keys_users', 'munin', 'id_rsa.pub', 'line'),
+    command     => '/usr/share/munin/munin-async --spoolfetch',
+    from        => $base::public_addresses,
+    collect_tag => 'munin::munin-async-fetch'
+  }
 
-	if $::hostname == 'menotti' {
-		ssl::service { 'munin.debian.org': }
-		file { '/etc/munin/munin-conf.d':
-			ensure  => directory,
-			mode    => '0755',
-			purge   => true,
-			force   => true,
-			recurse => true,
-			source  => 'puppet:///files/empty/',
-		}
+  file { '/etc/munin/munin.conf':
+    content => template('munin/munin.conf.erb'),
+    require => Package['munin'];
+  }
 
-		Munin::Master-per-node<<| |>>
-	}
+  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',
+  }
 }