Make it work with jessie, I

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index ceebb2d8eb66511b32eff10b1d5fc1c553b2df38..e2809f807abaf1c48ec80fb3bbb648f2f30ee1a3 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -13,9 +13,8 @@ class monit {
        }
 
        $cmd = $::lsbdistcodename ? {
        }
 
        $cmd = $::lsbdistcodename ? {

-               'sid'    => '/usr/bin/monit',
-               'wheezy' => '/usr/bin/monit',
-               default  => '/usr/sbin/monit',
+               'squeeze'    => '/usr/sbin/monit',
+               default  => '/usr/bin/monit',

        }
 
        augeas { 'inittab_monit':
        }
 
        augeas { 'inittab_monit':

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index c9b9853ed01a5a8ed3f4ed60a14ab27cbc3f7c1e..19b563f4c2a8216bd43f852b02fc9fd1942b1341 100644 (file)
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -11,14 +11,12 @@ class munin {
 
        $owner = $::lsbdistcodename ? {
                squeeze => munin,
 
        $owner = $::lsbdistcodename ? {
                squeeze => munin,

-               wheezy  => root,
-               undef => munin,
+               default  => root,

        }
 
        $gid = $::lsbdistcodename ? {
                squeeze => adm,
        }
 
        $gid = $::lsbdistcodename ? {
                squeeze => adm,

-               wheezy  => 'www-data',
-               undef => adm,
+               default => 'www-data',

        }
 
        file { '/var/log/munin':
        }
 
        file { '/var/log/munin':