summaryrefslogtreecommitdiff
path: root/puppet/modules/site_shorewall
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-02 17:09:22 -0400
committerMicah Anderson <micah@riseup.net>2013-04-02 17:41:49 -0400
commit0227e03513f38cfae4a041ba6740b425fdc21198 (patch)
tree4cea487310194ee54d89663a315629f0328277e3 /puppet/modules/site_shorewall
parentee1555bd9091e1ffe66e54856d2bde72d50a7e60 (diff)
replace hard-coded port number with hiera determined one, manipulated to remove the 'ip:' from the beginning in bigcouch replication client stunnels
Diffstat (limited to 'puppet/modules/site_shorewall')
-rw-r--r--puppet/modules/site_shorewall/manifests/couchdb/bigcouch.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_shorewall/manifests/couchdb/bigcouch.pp b/puppet/modules/site_shorewall/manifests/couchdb/bigcouch.pp
index a0d63d15..85272657 100644
--- a/puppet/modules/site_shorewall/manifests/couchdb/bigcouch.pp
+++ b/puppet/modules/site_shorewall/manifests/couchdb/bigcouch.pp
@@ -7,6 +7,7 @@ class site_shorewall::couchdb::bigcouch {
$bigcouch_replication_server = $stunnel['bigcouch_replication_server']
$bigcouch_replication_server_port = $bigcouch_replication_server['accept']
+ $bigcouch_replication_connect = $bigcouch_replication_server['connect']
# define macro for incoming services
file { '/etc/shorewall/macro.leap_bigcouch':
@@ -26,7 +27,7 @@ class site_shorewall::couchdb::bigcouch {
$bigcouch_shorewall_dnat_defaults = {
'source' => '$FW',
'proto' => 'tcp',
- 'destinationport' => '4369',
+ 'destinationport' => regsubst($bigcouch_replication_connect, '^([0-9.]+:)([0-9]+)$', '\2')
}
create_resources(site_shorewall::couchdb::dnat, $bigcouch_replication_clients, $bigcouch_shorewall_dnat_defaults)