From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 1 Feb 2013 00:55:54 +0000 (-0200)
Subject: Always add the local zone
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0edfe1d40f5a900e16d86461ee50238006d3b77b;p=puppet-nodo.git

Always add the local zone
---

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 161f632..12e0729 100644
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -154,6 +154,11 @@ class firewall(
     order => '3',
   }
 
+  shorewall::zone { 'loc':
+    type  => 'ipv4',
+    order => 4,
+  }
+
   #
   # Traffic shapping
   #
diff --git a/manifests/subsystems/firewall/local.pp b/manifests/subsystems/firewall/local.pp
index 7e23e29..f17680e 100644
--- a/manifests/subsystems/firewall/local.pp
+++ b/manifests/subsystems/firewall/local.pp
@@ -5,11 +5,6 @@ class firewall::local(
   $manage_interface = hiera('nodo::firewall::local::manage_iface', false)
 ) {
 
-  shorewall::zone { 'loc':
-    type  => 'ipv4',
-    order => 4,
-  }
-
   if $manage_host {
     shorewall::host { "$interface-loc":
       name    => "$interface:$network",