From a47c22e58d6502bb314e9fca3814fae1cadc62e5 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 21 Feb 2010 16:47:42 +0000 Subject: [PATCH] will ferm do the right thing? Signed-off-by: Stephen Gran --- .../ferm/{files/ferm.conf => templates/ferm.conf.erb} | 0 modules/munin-node/manifests/init.pp | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) rename modules/ferm/{files/ferm.conf => templates/ferm.conf.erb} (100%) diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/templates/ferm.conf.erb similarity index 100% rename from modules/ferm/files/ferm.conf rename to modules/ferm/templates/ferm.conf.erb diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp index ac999ef9..06d47ced 100644 --- a/modules/munin-node/manifests/init.pp +++ b/modules/munin-node/manifests/init.pp @@ -74,9 +74,14 @@ class munin-node { path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", refreshonly => true, } - @ferm::rule { "dsa-munin": + @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) ACCEPT; }" + rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }" + } + @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 \$HOST_NAGIOS_V6) ACCEPT; }" } } -- 2.39.2