ignore newer yaboots on the PPCs

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

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 06f71a0..7792b08 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,17 +1,21 @@
 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";
@@ -42,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