From 0edfe1d40f5a900e16d86461ee50238006d3b77b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 31 Jan 2013 22:55:54 -0200
Subject: Always add the local zone

---
 manifests/subsystems/firewall.pp       | 5 +++++
 manifests/subsystems/firewall/local.pp | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests')

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",
-- 
cgit v1.2.3