X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=c9b9853ed01a5a8ed3f4ed60a14ab27cbc3f7c1e;hb=b77434dd8426d362d9109281022d9239fd1bdcd9;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..c9b9853ed 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -40,6 +40,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',
@@ -67,13 +72,21 @@ class munin {
 			;
 	}
 
-	if $::munin_async and str2bool($::munin_async) == true {
-		file { '/etc/ssh/userkeys/munin-async':
-			source => 'puppet:///modules/munin/munin-async-authkeys',
+	#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
 		}
-	} else {
 		file { '/etc/ssh/userkeys/munin-async':
-			ensure => 'absent',
+			source => 'puppet:///modules/munin/munin-async-authkeys',
 		}
 	}
 }