Adding source and zone parameters at firewall::router::hairpinning

diff --git a/manifests/subsystems/firewall/router.pp b/manifests/subsystems/firewall/router.pp
index e5563a00391101238c01dcf6b693859643ea6908..cd18c326509fa95ac79ee047ebaed201c88db725 100644 (file)
--- 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       => '-',