projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
ceebb2d
..
2e0e68a
100644
(file)
--- a/
modules/monit/manifests/init.pp
+++ b/
modules/monit/manifests/init.pp
@@
-13,9
+13,8
@@
class monit {
}
$cmd = $::lsbdistcodename ? {
}
$cmd = $::lsbdistcodename ? {
- 'sid' => '/usr/bin/monit',
- 'wheezy' => '/usr/bin/monit',
- default => '/usr/sbin/monit',
+ 'squeeze' => '/usr/sbin/monit',
+ default => '/usr/bin/monit',
}
augeas { 'inittab_monit':
}
augeas { 'inittab_monit':
@@
-32,7
+31,7
@@
class monit {
ensure => directory,
mode => '0755',
purge => true,
ensure => directory,
mode => '0755',
purge => true,
- notify => Exec['monit stop'],
+ notify => Exec['
service
monit stop'],
require => Package['monit'],
}
file { '/etc/monit/monit.d':
require => Package['monit'],
}
file { '/etc/monit/monit.d':
@@
-55,11
+54,10
@@
class monit {
file { '/etc/default/monit':
content => template('monit/default.erb'),
require => Package['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,
}
}
refreshonly => true,
}
}