aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-08-11 17:38:25 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-08-11 17:38:25 -0300
commit52f68bb9ec16ebd8843d7f1aac245e1126d17ded (patch)
tree053ab01c4f74590862bee179c16cd2086fa2fe3e
parent6c3389e769d79cedb91f612678d58e6762c89366 (diff)
downloadpuppet-nodo-52f68bb9ec16ebd8843d7f1aac245e1126d17ded.tar.gz
puppet-nodo-52f68bb9ec16ebd8843d7f1aac245e1126d17ded.tar.bz2
Minor changes
-rw-r--r--manifests/subsystems/firewall.pp2
-rw-r--r--manifests/subsystems/firewall/local.pp4
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 841757a..c3c5396 100644
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -200,7 +200,7 @@ class firewall {
}
if $shorewall_local_net {
- class { 'firewall::local':
+ class { "firewall::local":
network => $shorewall_local_net_network,
interface => $shorewall_local_net_iface,
manage_host => $shorewall_local_net_manage_host,
diff --git a/manifests/subsystems/firewall/local.pp b/manifests/subsystems/firewall/local.pp
index 71c21cd..a9b40a9 100644
--- a/manifests/subsystems/firewall/local.pp
+++ b/manifests/subsystems/firewall/local.pp
@@ -2,7 +2,7 @@ class firewall::local($network = '192.168.1.0/24', $interface = 'eth0', $manage_
if $manage_host {
shorewall::host { "$interface-loc":
- name => "$interface:$network",
+ name => "$interface:$network",
zone => 'loc',
options => '',
order => '3',
@@ -10,7 +10,7 @@ class firewall::local($network = '192.168.1.0/24', $interface = 'eth0', $manage_
}
if $manage_interface {
- shorewall::interface { $interface:
+ shorewall::interface { "$interface":
zone => 'loc',
rfc1918 => true,
dhcp => true,