projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and actually quote correctly
[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
29bef07
..
0849cc1
100644
(file)
--- a/
modules/munin-node/manifests/init.pp
+++ b/
modules/munin-node/manifests/init.pp
@@
-1,13
+1,13
@@
-define activate_munin_check($ensure=present, $script
=$nam
e) {
+define activate_munin_check($ensure=present, $script
= non
e) {
case $script {
case $script {
-
"": { $base
= $name }
- default: { $
base
= $script }
+
none: { $link
= $name }
+ default: { $
link
= $script }
}
case $ensure {
present: {
file { "/etc/munin/plugins/$name":
}
case $ensure {
present: {
file { "/etc/munin/plugins/$name":
- ensure => "/usr/share/munin/plugins/$
base
",
+ ensure => "/usr/share/munin/plugins/$
link
",
notify => Exec["munin-node restart"];
}
}
notify => Exec["munin-node restart"];
}
}
@@
-75,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":
+ domain => "(ip ip6)",
+ description => "Allow munin from munin master",
+ rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
+ }
}
}