From ab95643a2ad84e74ea08955ab3605d44263e1c2d Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 21 Feb 2010 16:48:28 +0000 Subject: [PATCH] Revert "will ferm do the right thing?" This reverts commit a47c22e58d6502bb314e9fca3814fae1cadc62e5. --- .../ferm/{templates/ferm.conf.erb => files/ferm.conf} | 0 modules/munin-node/manifests/init.pp | 9 ++------- 2 files changed, 2 insertions(+), 7 deletions(-) rename modules/ferm/{templates/ferm.conf.erb => files/ferm.conf} (100%) diff --git a/modules/ferm/templates/ferm.conf.erb b/modules/ferm/files/ferm.conf similarity index 100% rename from modules/ferm/templates/ferm.conf.erb rename to modules/ferm/files/ferm.conf diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp index 06d47cedf..ac999ef90 100644 --- a/modules/munin-node/manifests/init.pp +++ b/modules/munin-node/manifests/init.pp @@ -74,14 +74,9 @@ class munin-node { path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", refreshonly => true, } - @ferm::rule { "dsa-munin-v4": + @ferm::rule { "dsa-munin": description => "Allow munin from munin master", - 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; }" + rule => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }" } } -- 2.20.1