projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This means we will install the openafs-client package automatically
[mirror/dsa-puppet.git]
/
modules
/
munin-node
/
manifests
/
init.pp
diff --git
a/modules/munin-node/manifests/init.pp
b/modules/munin-node/manifests/init.pp
index
950d9cc
..
ab17781
100644
(file)
--- a/
modules/munin-node/manifests/init.pp
+++ b/
modules/munin-node/manifests/init.pp
@@
-54,7
+54,13
@@
class munin-node {
case $vsftpd {
"true": {
case $vsftpd {
"true": {
- include munin-node::vsftpd
+ package {
+ "logtail": ensure => installed;
+ }
+ activate_munin_check {
+ "vsftpd":;
+ "ps_vsftpd": script => "ps_";
+ }
}
}
}
}
@@
-76,12
+82,17
@@
class munin-node {
}
@ferm::rule { "dsa-munin-v4":
description => "Allow munin from munin master",
}
@ferm::rule { "dsa-munin-v4":
description => "Allow munin from munin master",
- rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4) ACCEPT; }"
+ rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }",
+ notarule => true,
}
@ferm::rule { "dsa-munin-v6":
description => "Allow munin from munin master",
domain => "ip6",
}
@ferm::rule { "dsa-munin-v6":
description => "Allow munin from munin master",
domain => "ip6",
- rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V6) ACCEPT; }"
+ rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V6 \$HOST_NAGIOS_V6) ACCEPT; }",
+ notarule => true,
}
}
}
}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: