Add a second intermediate for gandi

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

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 8b9880f..2e0e68a 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -13,33 +13,29 @@ 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':
+       augeas { 'inittab_monit':
                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\"",
+               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\"",
                ],
                notify => Exec['init q'],
        }
 
        file { '/etc/monit/':
                ensure  => directory,
-               owner   => root,
-               group   => root,
                mode    => '0755',
                purge   => true,
-               notify  => Exec['monit stop'],
+               notify  => Exec['service monit stop'],
                require => Package['monit'],
        }
        file { '/etc/monit/monit.d':
                ensure  => directory,
-               owner   => root,
-               group   => root,
                mode    => '0750',
                purge   => true,
        }
@@ -58,11 +54,10 @@ class monit {
        file { '/etc/default/monit':
                content => template('monit/default.erb'),
                require => Package['monit'],
-               notify  => Exec['monit stop']
+               notify  => Exec['service monit stop']
        }
 
-       exec { 'monit stop':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service monit stop':
                refreshonly => true,
        }
 }