aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-31 22:55:54 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-31 22:55:54 -0200
commit0edfe1d40f5a900e16d86461ee50238006d3b77b (patch)
treeb0a6742d94132b76fcfc7bcfba64993a67ffa8f3 /manifests/subsystems
parent1b623e220c38f37b65a01f4dd06c0b7538a3abd8 (diff)
downloadpuppet-nodo-0edfe1d40f5a900e16d86461ee50238006d3b77b.tar.gz
puppet-nodo-0edfe1d40f5a900e16d86461ee50238006d3b77b.tar.bz2
Always add the local zone
Diffstat (limited to 'manifests/subsystems')
-rw-r--r--manifests/subsystems/firewall.pp5
-rw-r--r--manifests/subsystems/firewall/local.pp5
2 files changed, 5 insertions, 5 deletions
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",