X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=5ddbf6eb3d86c1150cf5f08719be8bf94c14effe;hb=c14d0a7356dc1222c88e9a7d4f4112c057f0c79f;hp=020b8270020532032bb278e07a3f159c06c20432;hpb=14b9d60ed88376a87c5643ea6731d5b0902ad312;p=mirror%2Fdsa-puppet.git diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp index 020b82700..5ddbf6eb3 100644 --- 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=$name) { +define activate_munin_check($ensure=present, $script = none) { case $script { - "": { $base = $name } - default: { $base = $script } + none: { $link = $name } + default: { $link = $script } } 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"]; } } @@ -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", @@ -60,7 +66,7 @@ class munin-node { notify => Exec["munin-node restart"]; "/etc/munin/plugin-conf.d/munin-node": - content => template("munin/munin-node.plugin.conf.erb"), + content => template("munin-node/munin-node.plugin.conf.erb"), require => Package["munin-node"], notify => Exec["munin-node restart"]; } @@ -69,5 +75,9 @@ class munin-node { path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", refreshonly => true, } + @ferm::rule { "dsa-munin": + description => "Allow munin from munin master", + rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }" + } }