Make it work with jessie, II

[dsa-puppet.git] / modules / munin / manifests / init.pp

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index c9b9853ed01a5a8ed3f4ed60a14ab27cbc3f7c1e..2522138345fe1e83e0325bbf781fdf7b548be8b6 100644 (file)
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -11,14 +11,12 @@ class munin {
 
        $owner = $::lsbdistcodename ? {
                squeeze => munin,
-               wheezy  => root,
-               undef => munin,
+               default  => root,
        }
 
        $gid = $::lsbdistcodename ? {
                squeeze => adm,
-               wheezy  => 'www-data',
-               undef => adm,
+               default => 'www-data',
        }
 
        file { '/var/log/munin':
@@ -81,7 +79,7 @@ class munin {
        #               ensure => 'absent',
        #       }
        #}
-       if $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
                package { 'munin-async':
                        ensure => installed
                }