X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=8730f53f36349764cf8f20dfc578b756140de2db;hb=a68ac2a388955f929b49474adfc31c2bf985258b;hp=8258f9b13248eab8ee0c2ae91971f0ffa141f42b;hpb=0ad5c1956a6e44f1d7ef04641a6fa0b03a6bec34;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 8258f9b13..8730f53f3 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -62,18 +62,26 @@ class munin {
 
 	@@munin::master-per-node {
 		$::fqdn:
-			ipaddress => $::ipaddress,
+			ipaddress   => $::ipaddress,
 			munin_async => $::munin_async,
 			;
 	}
 
-	if $munin_async and $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',
 		}
 	}
 }