X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=b4e31fcbb49990ec07390311bdbf904669714b14;hb=3ec179d34448f751f292a628f4f8bc1f4ae134b7;hp=cad4319d73b5a9764258fdab90e178767c3d290f;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index cad4319d7..b4e31fcbb 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,7 +1,28 @@
 class monit {
     package { "monit": ensure => installed }
 
+    $cmd = $::lsbdistcodename == 'sid' or $::lsbmajdistrelease > '6' ? {
+         true    => '/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 \"$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/monit/":
           ensure  => directory,
           owner   => root,
@@ -13,7 +34,7 @@ class monit {
         "/etc/monit/monitrc":
           content => template("monit/monitrc.erb"),
           require => Package["monit"],
-          notify  => Exec["monit restart"],
+          notify  => Exec["monit stop"],
           mode    => 400
           ;
 
@@ -26,26 +47,26 @@ class monit {
           ;
 
         "/etc/monit/monit.d/01puppet":
-          source  => "puppet:///monit/puppet",
+          source  => "puppet:///modules/monit/puppet",
           require => Package["monit"],
-          notify  => Exec["monit restart"],
+          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 restart"],
+          notify  => Exec["monit stop"],
           mode    => 440
           ;
 
         "/etc/default/monit":
           content => template("monit/default.erb"),
           require => Package["monit"],
-          notify  => Exec["monit restart"]
+          notify  => Exec["monit stop"]
           ;
     }
-    exec { "monit restart":
+    exec { "monit stop":
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }