From b5643329942ff7a0236c3da65725fb50f2ad21d8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 6 Nov 2014 17:53:39 +0000 Subject: [PATCH] Make it work with jessie, I --- modules/monit/manifests/init.pp | 5 ++--- modules/munin/manifests/init.pp | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp index ceebb2d8e..e2809f807 100644 --- a/modules/monit/manifests/init.pp +++ b/modules/monit/manifests/init.pp @@ -13,9 +13,8 @@ class monit { } $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': diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp index c9b9853ed..19b563f4c 100644 --- 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': -- 2.20.1