projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unlimit berlioz
[mirror/dsa-puppet.git]
/
modules
/
nagios
/
manifests
/
client.pp
diff --git
a/modules/nagios/manifests/client.pp
b/modules/nagios/manifests/client.pp
index
7393260
..
2b76eb6
100644
(file)
--- a/
modules/nagios/manifests/client.pp
+++ b/
modules/nagios/manifests/client.pp
@@
-14,8
+14,7
@@
class nagios::client inherits nagios {
ensure => absent,
notify => Exec["nagios-nrpe-server restart"];
"/etc/nagios/nrpe.cfg":
ensure => absent,
notify => Exec["nagios-nrpe-server restart"];
"/etc/nagios/nrpe.cfg":
- source => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg",
- "puppet:///modules/nagios/common/nrpe.cfg" ],
+ content => template("nagios/nrpe.cfg.erb"),
require => Package["nagios-nrpe-server"],
notify => Exec["nagios-nrpe-server restart"];
"/etc/nagios/nrpe.d":
require => Package["nagios-nrpe-server"],
notify => Exec["nagios-nrpe-server restart"];
"/etc/nagios/nrpe.d":
@@
-23,7
+22,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":
-
content => template("nagios/inc-debian.org.erb"),
+ 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":
@@
-47,12
+46,14
@@
class nagios::client inherits nagios {
}
@ferm::rule { "dsa-nagios-v4":
description => "Allow nrpe from nagios master",
}
@ferm::rule { "dsa-nagios-v4":
description => "Allow nrpe from nagios master",
- rule => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V4) ACCEPT; }"
+ rule => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V4) ACCEPT; }",
+ notarule => true,
}
@ferm::rule { "dsa-nagios-v6":
description => "Allow nrpe from nagios master",
domain => "ip6",
}
@ferm::rule { "dsa-nagios-v6":
description => "Allow nrpe from nagios master",
domain => "ip6",
- rule => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }"
+ rule => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }",
+ notarule => true,
}
}
# vim:set et:
}
}
# vim:set et: