From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Mar 2016 22:28:13 +0000 (+0100)
Subject: munin: squeeze cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c3bc960fcdaf791cf4d333698b43bc1c976d6cc4;hp=ec4fd3195fd71edde7bd1e7a9624b4b4255f8da5;p=mirror%2Fdsa-puppet.git

munin: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 19b563f4c..3f7f4ae0f 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -9,20 +9,10 @@ class munin {
 		require => Package['munin-node'],
 	}
 
-	$owner = $::lsbdistcodename ? {
-		squeeze => munin,
-		default  => root,
-	}
-
-	$gid = $::lsbdistcodename ? {
-		squeeze => adm,
-		default => 'www-data',
-	}
-
 	file { '/var/log/munin':
 		ensure => directory,
-		owner  => $owner,
-		group  => $gid,
+		owner  => root,
+		group  => 'www-data',
 		mode   => '0755',
 	}
 
@@ -79,12 +69,10 @@ class munin {
 	#		ensure => 'absent',
 	#	}
 	#}
-	if $::lsbmajdistrelease >= 7 {
-		package { 'munin-async':
-			ensure => installed
-		}
-		file { '/etc/ssh/userkeys/munin-async':
-			source => 'puppet:///modules/munin/munin-async-authkeys',
-		}
+	package { 'munin-async':
+		ensure => installed
+	}
+	file { '/etc/ssh/userkeys/munin-async':
+		source => 'puppet:///modules/munin/munin-async-authkeys',
 	}
 }