projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more bacula mail, but to bacula-reports@d.o
[mirror/dsa-puppet.git]
/
modules
/
nagios
/
manifests
/
client.pp
diff --git
a/modules/nagios/manifests/client.pp
b/modules/nagios/manifests/client.pp
index
7479403
..
a2c2230
100644
(file)
--- a/
modules/nagios/manifests/client.pp
+++ b/
modules/nagios/manifests/client.pp
@@
-4,7
+4,8
@@
class nagios::client inherits nagios {
ensure => purged
}
package { 'dsa-nagios-checks':
ensure => purged
}
package { 'dsa-nagios-checks':
- ensure => installed
+ ensure => installed,
+ tag => extra_repo,
}
service { 'nagios-nrpe-server':
}
service { 'nagios-nrpe-server':
@@
-36,7
+37,8
@@
class nagios::client inherits nagios {
}
file { '/etc/nagios/':
ensure => directory,
}
file { '/etc/nagios/':
ensure => directory,
- mode => '0755',
+ recurse => remote,
+ source => 'puppet:///files/empty/',
require => Package['nagios-nrpe-server'],
notify => Service['nagios-nrpe-server'],
}
require => Package['nagios-nrpe-server'],
notify => Service['nagios-nrpe-server'],
}
@@
-46,7
+48,8
@@
class nagios::client inherits nagios {
}
file { '/etc/nagios/nrpe.d':
ensure => directory,
}
file { '/etc/nagios/nrpe.d':
ensure => directory,
- mode => '0755',
+ recurse => remote,
+ source => 'puppet:///files/empty/',
notify => Service['nagios-nrpe-server'],
}
file { '/etc/nagios/nrpe.d/debianorg.cfg':
notify => Service['nagios-nrpe-server'],
}
file { '/etc/nagios/nrpe.d/debianorg.cfg':