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/couchdb/dnat.pp | 6 +++---
 puppet/modules/site_shorewall/manifests/dnat.pp         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/site_shorewall')

diff --git a/puppet/modules/site_shorewall/manifests/couchdb/dnat.pp b/puppet/modules/site_shorewall/manifests/couchdb/dnat.pp
index 85cea9d5..f1bc9acf 100644
--- a/puppet/modules/site_shorewall/manifests/couchdb/dnat.pp
+++ b/puppet/modules/site_shorewall/manifests/couchdb/dnat.pp
@@ -10,12 +10,12 @@ define site_shorewall::couchdb::dnat (
 
   shorewall::rule {
     "dnat_${name}_${destinationport}":
+      action          => 'DNAT',
       source          => $source,
       destination     => "\$FW:127.0.0.1:${accept_port}",
+      proto           => $proto,
       destinationport => $destinationport,
       originaldest    => $connect,
-      proto           => $proto,
-      order           => 200,
-      action          => 'DNAT';
+      order           => 200
   }
 }
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