From: Stephen Gran <steve@lobefin.net>
Date: Sat, 20 Feb 2010 22:17:32 +0000 (+0000)
Subject: dammit.  ferm is smarter than me
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c7efeb3b34546e8c252d9a258346f5251953bef4;p=mirror%2Fdsa-puppet.git

dammit.  ferm is smarter than me

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 0849cc1bd..93a4af709 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -76,7 +76,6 @@ class munin-node {
         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; }"
     }
diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 053c6dc6b..edfbbfadc 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -46,7 +46,6 @@ class nagios::client inherits nagios {
 		refreshonly => true,
 	}
         ferm::rule { "dsa-nagios":
-                domain          => "(ip ip6)",
                 description     => "Allow nrpe from nagios master",
                 rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
         }