X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=7792b086f0b55a619942500bfc9f4085a4119bd2;hb=9087fad15c18e19960f90f19e0115658a3fc462c;hp=af4bea32d408a8c9d70d45ed7391612dfa5209df;hpb=c6ab7159bb0fc969ac9584103ec3268bec687e67;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index af4bea32d..7792b086f 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,23 +1,26 @@
 class monit {
     package { "monit": ensure => installed }
 
+    $cmd = $::lsbdistcodename ? {
+         'sid'      => '/usr/bin/monit',
+         'wheezy'   => '/usr/bin/monit',
+         default  => '/usr/sbin/monit',
+    }
+
     augeas { "inittab":
         context => "/files/etc/inittab",
         changes => [ "set mo/runlevels 2345",
                      "set mo/action respawn",
-                     "set mo/process \"/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
+                     "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;
-
-        "/etc/rc2.d/S99monit":
-          ensure  => absent;
+        #"/etc/rc2.d/K99monit":
+        #  ensure  => "../init.d/monit";
+        #"/etc/rc2.d/S99monit":
+        #  ensure  => absent;
 
         "/etc/monit/":
           ensure  => directory,
@@ -43,14 +46,14 @@ class monit {
           ;
 
         "/etc/monit/monit.d/01puppet":
-          source  => "puppet:///monit/puppet",
+          source  => "puppet:///modules/monit/puppet",
           require => Package["monit"],
           notify  => Exec["monit stop"],
           mode    => 440
           ;
 
         "/etc/monit/monit.d/00debian.org":
-          source  => "puppet:///monit/debianorg",
+          source  => "puppet:///modules/monit/debianorg",
           require => Package["monit"],
           notify  => Exec["monit stop"],
           mode    => 440