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' into staging
[mirror/dsa-puppet.git]
/
modules
/
nagios
/
manifests
/
client.pp
diff --git
a/modules/nagios/manifests/client.pp
b/modules/nagios/manifests/client.pp
index
a49aec5
..
285fdfc
100644
(file)
--- a/
modules/nagios/manifests/client.pp
+++ b/
modules/nagios/manifests/client.pp
@@
-23,8
+23,7
@@
class nagios::client inherits nagios {
require => Package["nagios-nrpe-server"],
ensure => directory;
"/etc/nagios/nrpe.d/debianorg.cfg":
require => Package["nagios-nrpe-server"],
ensure => directory;
"/etc/nagios/nrpe.d/debianorg.cfg":
- source => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
- "puppet:///nagios/common/inc-debian.org" ],
+ content => template("nagios/inc-debian.org.erb"),
require => Package["nagios-nrpe-server"],
notify => Exec["nagios-nrpe-server restart"];
"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
require => Package["nagios-nrpe-server"],
notify => Exec["nagios-nrpe-server restart"];
"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
@@
-38,8
+37,7
@@
class nagios::client inherits nagios {
require => Package["dsa-nagios-checks"];
"/etc/nagios/obsolete-packages-ignore.d/hostspecific":
require => Package["dsa-nagios-checks"];
"/etc/nagios/obsolete-packages-ignore.d/hostspecific":
- source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore.d-hostspecific",
- "puppet:///nagios/common/obsolete-packages-ignore.d-hostspecific" ],
+ content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
require => Package["dsa-nagios-checks"];
}
require => Package["dsa-nagios-checks"];
}