summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-02 17:43:43 -0400
committerMicah Anderson <micah@riseup.net>2013-04-02 17:43:43 -0400
commit1750bec7032e90ddbe43da35eb5f49066187d1d4 (patch)
tree14d0fc88c47e93d1a6782ef16898014fb54f6b7c /puppet/modules
parent0227e03513f38cfae4a041ba6740b425fdc21198 (diff)
shorewall: re-order dnat rule variables to match configuration file order
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_shorewall/manifests/couchdb/dnat.pp6
-rw-r--r--puppet/modules/site_shorewall/manifests/dnat.pp6
2 files changed, 6 insertions, 6 deletions
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
}
}