X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=19b563f4c2a8216bd43f852b02fc9fd1942b1341;hb=a2aea510648d1d58789365a2d0b7bae76fcca37b;hp=62805de2b2872ba1e6d41480aa9f8cb3f3d07fd7;hpb=2bd7dac7ee73ba48b8b276465668c023147a0896;p=dsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 62805de2..19b563f4 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -11,14 +11,12 @@ class munin {
 
 	$owner = $::lsbdistcodename ? {
 		squeeze => munin,
-		wheezy  => root,
-		undef => munin,
+		default  => root,
 	}
 
 	$gid = $::lsbdistcodename ? {
 		squeeze => adm,
-		wheezy  => 'www-data',
-		undef => adm,
+		default => 'www-data',
 	}
 
 	file { '/var/log/munin':
@@ -40,6 +38,11 @@ class munin {
 		notify  => Service['munin-node'],
 	}
 
+	file { '/etc/logrotate.d/munin-node':
+		source => 'puppet:///modules/munin/logrotate',
+		require => Package['munin-node'],
+	}
+
 	file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
 		source => 'puppet:///modules/munin/df-wrap',
 		mode    => '0555',
@@ -59,4 +62,29 @@ class munin {
 		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V6 $HOST_NAGIOS_V6) ACCEPT; }',
 		notarule        => true,
 	}
+
+	@@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',
+	#	}
+	#}
+	if $::lsbmajdistrelease >= 7 {
+		package { 'munin-async':
+			ensure => installed
+		}
+		file { '/etc/ssh/userkeys/munin-async':
+			source => 'puppet:///modules/munin/munin-async-authkeys',
+		}
+	}
 }