projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "does that work?"
[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
d70ffdc
..
c3b4a12
100644
(file)
--- a/
modules/munin-node/manifests/init.pp
+++ b/
modules/munin-node/manifests/init.pp
@@
-1,4
+1,4
@@
-define activate_munin_check($ensure=present, script=$name) {
+define activate_munin_check($ensure=present,
$
script=$name) {
case $script {
"": { $base = $name }
default: { $base = $script }
case $script {
"": { $base = $name }
default: { $base = $script }
@@
-52,6
+52,12
@@
class munin-node {
}
}
}
}
+ case $vsftpd {
+ "true": {
+ include munin-node::vsftpd
+ }
+ }
+
file {
"/etc/munin/munin-node.conf":
source => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
file {
"/etc/munin/munin-node.conf":
source => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
@@
-69,5
+75,10
@@
class munin-node {
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
+ ferm::rule { "dsa-munin":
+ description => "Allow munin-node from spohr.debian.org",
+ rule => "proto tcp dport 4949 saddr $HOST_MUNIN ACCEPT",
+ prio => "02"
+ }
}
}