X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=37b30303e715fc66457404bff77c12067a57d043;hb=07542997c11a1d8769a9fa21a660c0650e426c05;hp=9684a2944424c25ab09ebcf5734217c0e0cf1a73;hpb=b5b17876a34290b9816805a274c81a2ffc209145;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 9684a2944..37b30303e 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,9 +28,28 @@ class munin {
 		notify  => Service['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',
+	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  => link,
+		target  => '/usr/share/munin/plugins/df_abs',
+		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'],
 	}
@@ -67,13 +74,19 @@ class munin {
 			;
 	}
 
-	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 $::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
+	}
+	file { '/etc/ssh/userkeys/munin-async':
+		source => 'puppet:///modules/munin/munin-async-authkeys',
 	}
 }