aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems/firewall
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-08-16 11:58:54 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-08-16 11:58:54 -0300
commite2c913347fe5675362f66d29777a3c7380958db0 (patch)
tree07786868a88823fac719c4910c0b0c265f0547ce /manifests/subsystems/firewall
parenta70ee90696bf5e1fa0e3cd7e54657987322088f3 (diff)
downloadpuppet-nodo-e2c913347fe5675362f66d29777a3c7380958db0.tar.gz
puppet-nodo-e2c913347fe5675362f66d29777a3c7380958db0.tar.bz2
Changing parameters at firewall::router::hairpinning
Diffstat (limited to 'manifests/subsystems/firewall')
-rw-r--r--manifests/subsystems/firewall/router.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/subsystems/firewall/router.pp b/manifests/subsystems/firewall/router.pp
index cd18c32..3a8b1af 100644
--- a/manifests/subsystems/firewall/router.pp
+++ b/manifests/subsystems/firewall/router.pp
@@ -326,11 +326,11 @@ class firewall::router::torrent($destination, $zone = 'loc') {
# See http://www.shorewall.net/FAQ.htm#faq2
define firewall::router::hairpinning($order = '200', $proto = 'tcp', $port = 'www',
$external_ip = '$ETH0_IP', $interface = 'eth1',
- $destination = 'loc:192.168.1.100', $source = 'eth1',
- $zone = 'loc') {
+ $destination = '192.168.1.100', $source = 'eth1',
+ $source_zone = 'loc', $dest_zone = 'loc') {
shorewall::masq { "routeback-$name":
interface => "$interface:$destination",
- source => $source,
+ source => $source_zone,
address => $external_ip,
proto => $proto,
port => $port,
@@ -340,7 +340,7 @@ define firewall::router::hairpinning($order = '200', $proto = 'tcp', $port = 'ww
shorewall::rule { "routeback-$name":
action => 'DNAT',
source => $zone,
- destination => $destination,
+ destination => "$dest_zone:$destination",
proto => $proto,
destinationport => $port,
ratelimit => '-',