X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=b4e31fcbb49990ec07390311bdbf904669714b14;hb=3ec179d34448f751f292a628f4f8bc1f4ae134b7;hp=5e8da8c81937d1d22f5075e385dda7d29f77d806;hpb=70a9bda9ef6e5fa2cebded47c59a11a2592c5511;p=mirror%2Fdsa-puppet.git diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp index 5e8da8c81..b4e31fcbb 100644 --- a/modules/monit/manifests/init.pp +++ b/modules/monit/manifests/init.pp @@ -1,11 +1,16 @@ 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 \"/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"],