From fbcc9e9a93816374e1b53b561df4b9d2a59ae7b8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 20 Mar 2013 22:01:41 +0100
Subject: added site_shorewall::dnat to configure DNAT rules

---
 puppet/modules/site_shorewall/manifests/dnat.pp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 puppet/modules/site_shorewall/manifests/dnat.pp

(limited to 'puppet/modules/site_shorewall/manifests/dnat.pp')

diff --git a/puppet/modules/site_shorewall/manifests/dnat.pp b/puppet/modules/site_shorewall/manifests/dnat.pp
new file mode 100644
index 00000000..5992c91f
--- /dev/null
+++ b/puppet/modules/site_shorewall/manifests/dnat.pp
@@ -0,0 +1,19 @@
+define site_shorewall::dnat (
+  $source,
+  $destination,
+  $proto,
+  $destinationport,
+  $originaldest ) {
+
+
+  shorewall::rule {
+    "dnat_${name}_${destinationport}":
+      source          => $source,
+      destination     => $destination,
+      destinationport => $destinationport,
+      originaldest    => $originaldest,
+      proto           => $proto,
+      order           => 200,
+      action          => 'DNAT';
+  }
+}
-- 
cgit v1.2.3


From 1750bec7032e90ddbe43da35eb5f49066187d1d4 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 2 Apr 2013 17:43:43 -0400
Subject: shorewall: re-order dnat rule variables to match configuration file
 order

---
 puppet/modules/site_shorewall/manifests/dnat.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_shorewall/manifests/dnat.pp')

diff --git a/puppet/modules/site_shorewall/manifests/dnat.pp b/puppet/modules/site_shorewall/manifests/dnat.pp
index 5992c91f..a73294cc 100644
--- a/puppet/modules/site_shorewall/manifests/dnat.pp
+++ b/puppet/modules/site_shorewall/manifests/dnat.pp
@@ -8,12 +8,12 @@ define site_shorewall::dnat (
 
   shorewall::rule {
     "dnat_${name}_${destinationport}":
+      action          => 'DNAT',
       source          => $source,
       destination     => $destination,
+      proto           => $proto,
       destinationport => $destinationport,
       originaldest    => $originaldest,
-      proto           => $proto,
-      order           => 200,
-      action          => 'DNAT';
+      order           => 200
   }
 }
-- 
cgit v1.2.3