From: Stephen Gran <steve@lobefin.net>
Date: Thu, 5 Jan 2012 21:59:27 +0000 (+0000)
Subject: Let's try one last time to get it right.
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=0a02f36748e254e39c4c21446ebc58a354cf780e

Let's try one last time to get it right.
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index b4e31fcb..7792b086 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,9 +1,10 @@
 class monit {
     package { "monit": ensure => installed }
 
-    $cmd = $::lsbdistcodename == 'sid' or $::lsbmajdistrelease > '6' ? {
-         true    => '/usr/bin/monit',
-         default => '/usr/sbin/monit',
+    $cmd = $::lsbdistcodename ? {
+         'sid'      => '/usr/bin/monit',
+         'wheezy'   => '/usr/bin/monit',
+         default  => '/usr/sbin/monit',
     }
 
     augeas { "inittab":
@@ -12,11 +13,9 @@ class monit {
                      "set mo/action respawn",
                      "set mo/process \"$cmd -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
                    ],
-        onlyif => "match mo size == 0",
         notify => Exec["init q"],
     }
 
-
     file {
         #"/etc/rc2.d/K99monit":
         #  ensure  => "../init.d/monit";