From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 31 May 2013 09:34:53 +0000 (+0200)
Subject: install munin-async on wheezy hosts
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=4a87e86ffd4eb2ba87e1bbc1582ed077267cb9cf;p=dsa-puppet.git

install munin-async on wheezy hosts
---

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 9684a294..8730f53f 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -67,13 +67,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',
 		}
 	}
 }