projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
[mirror/dsa-puppet.git]
/
modules
/
monit
/
manifests
/
init.pp
diff --git
a/modules/monit/manifests/init.pp
b/modules/monit/manifests/init.pp
index
a3b9282
..
5e1ebe0
100644
(file)
--- a/
modules/monit/manifests/init.pp
+++ b/
modules/monit/manifests/init.pp
@@
-1,17
+1,22
@@
class monit {
class monit {
- package { "monit": ensure => installed;
- }
+ package { "monit": ensure => installed }
file {
file {
+ "/etc/monit/":
+ ensure => directory,
+ owner => root,
+ group => root,
+ mode => 755,
+ purge => true
+ ;
+
"/etc/monit/monitrc":
source => "puppet:///monit/monitrc",
require => Package["monit"],
"/etc/monit/monitrc":
source => "puppet:///monit/monitrc",
require => Package["monit"],
- notify => Exec["monit restart"]
- mode => 4
40,
+ notify => Exec["monit restart"]
,
+ mode => 4
00
;
;
- }
- file {
"/etc/monit/monit.d":
ensure => directory,
owner => root,
"/etc/monit/monit.d":
ensure => directory,
owner => root,
@@
-19,27
+24,21
@@
class monit {
mode => 750,
purge => true
;
mode => 750,
purge => true
;
- }
- file {
"/etc/monit/monit.d/01puppet":
source => "puppet:///monit/puppet",
require => Package["monit"],
"/etc/monit/monit.d/01puppet":
source => "puppet:///monit/puppet",
require => Package["monit"],
- notify => Exec["monit restart"]
- mode => 440
,
+ notify => Exec["monit restart"]
,
+ mode => 440
;
;
- }
- file {
"/etc/monit/monit.d/00debian.org":
source => "puppet:///monit/debianorg",
require => Package["monit"],
"/etc/monit/monit.d/00debian.org":
source => "puppet:///monit/debianorg",
require => Package["monit"],
- notify => Exec["monit restart"]
- mode => 440
,
+ notify => Exec["monit restart"]
,
+ mode => 440
;
;
- }
- file {
"/etc/default/monit":
source => "puppet:///monit/default",
require => Package["monit"],
"/etc/default/monit":
source => "puppet:///monit/default",
require => Package["monit"],