X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=5ea2762b0d15c9d3b0e2ff357e3c1a94d1a2b293;hb=d72d73ccae39e018592248314119b22994520e29;hp=d5df24ef8741b23fd137cc813613b6434633f21b;hpb=996a1160f23dbaf10a537e6502f75a0dd1dbc0b2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index d5df24ef8..5ea2762b0 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -9,22 +9,10 @@ class munin {
 		require => Package['munin-node'],
 	}
 
-	$owner = $::lsbdistcodename ? {
-		squeeze => munin,
-		wheezy  => root,
-		undef => munin,
-	}
-
-	$gid = $::lsbdistcodename ? {
-		squeeze => adm,
-		wheezy  => 'www-data',
-		undef => adm,
-	}
-
 	file { '/var/log/munin':
 		ensure => directory,
-		owner  => $owner,
-		group  => $gid,
+		owner  => root,
+		group  => 'www-data',
 		mode   => '0755',
 	}
 
@@ -40,13 +28,33 @@ class munin {
 		notify  => Service['munin-node'],
 	}
 
-	file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
+	file { '/etc/logrotate.d/munin-node':
+		source => 'puppet:///modules/munin/logrotate',
+		require => Package['munin-node'],
+	}
+
+	file { '/etc/munin/plugins/df':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df',
+		require => Package['munin-node'],
+		notify  => Service['munin-node'],
+	}
+
+	file { '/etc/munin/plugins/df_abs':
+		ensure  => file,
 		source => 'puppet:///modules/munin/df-wrap',
 		mode    => '0555',
 		require => Package['munin-node'],
 		notify  => Service['munin-node'],
 	}
 
+	file { '/etc/munin/plugins/df_inode':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df_inode',
+		require => Package['munin-node'],
+		notify  => Service['munin-node'],
+	}
+
 	@ferm::rule { 'dsa-munin-v4':
 		description     => 'Allow munin from munin master',
 		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) ACCEPT; }',
@@ -60,5 +68,34 @@ class munin {
 		notarule        => true,
 	}
 
-	@@munin::master-per-node { $::fqdn: }
+	@@munin::master_per_node { $::fqdn:
+			ipaddress   => $::ipaddress,
+			munin_async => $::munin_async,
+	}
+
+	#if $::munin_async and str2bool($::munin_async) == true {
+	#	file { '/etc/ssh/userkeys/munin-async':
+	#		source => 'puppet:///modules/munin/munin-async-authkeys',
+	#	}
+	#} else {
+	#	file { '/etc/ssh/userkeys/munin-async':
+	#		ensure => 'absent',
+	#	}
+	#}
+	package { 'munin-async':
+		ensure => installed
+	}
+	service { 'munin-async':
+		ensure  => running,
+		require => Package['munin-async'],
+	}
+	systemd::override { 'munin-async':
+		content  => @("EOF"),
+			[Service]
+			RestartSec=10
+			| EOF
+	}
+	file { '/etc/ssh/userkeys/munin-async':
+		source => 'puppet:///modules/munin/munin-async-authkeys',
+	}
 }