From a70ee90696bf5e1fa0e3cd7e54657987322088f3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 16 Aug 2011 11:44:23 -0300 Subject: Adding source and zone parameters at firewall::router::hairpinning --- manifests/subsystems/firewall/router.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manifests/subsystems/firewall/router.pp b/manifests/subsystems/firewall/router.pp index e5563a0..cd18c32 100644 --- a/manifests/subsystems/firewall/router.pp +++ b/manifests/subsystems/firewall/router.pp @@ -326,10 +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 = '192.168.1.100') { + $destination = 'loc:192.168.1.100', $source = 'eth1', + $zone = 'loc') { shorewall::masq { "routeback-$name": interface => "$interface:$destination", - source => $interface, + source => $source, address => $external_ip, proto => $proto, port => $port, @@ -338,8 +339,8 @@ define firewall::router::hairpinning($order = '200', $proto = 'tcp', $port = 'ww shorewall::rule { "routeback-$name": action => 'DNAT', - source => 'loc', - destination => "loc:$destination", + source => $zone, + destination => $destination, proto => $proto, destinationport => $port, ratelimit => '-', -- cgit v1.2.3