diff options
| author | elijah <elijah@riseup.net> | 2013-04-02 15:38:54 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-04-02 15:38:54 -0700 |
| commit | d2b525e0e471792ecc734b7b9f4f7ebcb98d868f (patch) | |
| tree | c7f90bffed40f447d989518e1636216335761907 /puppet/modules/site_shorewall/manifests/couchdb.pp | |
| parent | 4ed5d33f33c488a6a6d5f6a5e8f57b74ecd53a7d (diff) | |
| parent | 1750bec7032e90ddbe43da35eb5f49066187d1d4 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_shorewall/manifests/couchdb.pp')
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/couchdb.pp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/puppet/modules/site_shorewall/manifests/couchdb.pp b/puppet/modules/site_shorewall/manifests/couchdb.pp index 9fa59569..1ef91bb0 100644 --- a/puppet/modules/site_shorewall/manifests/couchdb.pp +++ b/puppet/modules/site_shorewall/manifests/couchdb.pp @@ -2,16 +2,20 @@ class site_shorewall::couchdb { include site_shorewall::defaults - $couchdb_port = '6984' + $stunnel = hiera('stunnel') + $couch_server = $stunnel['couch_server'] + $couch_stunnel_port = $couch_server['accept'] + + # see http://stackoverflow.com/questions/8459949/bigcouch-cluster-connection-issue#comment10467603_8463814 + $erlang_vm_port = '9001' # define macro for incoming services file { '/etc/shorewall/macro.leap_couchdb': - content => "PARAM - - tcp $couchdb_port", + content => "PARAM - - tcp ${couch_stunnel_port},${erlang_vm_port}", notify => Service['shorewall'], require => Package['shorewall'] } - shorewall::rule { 'net2fw-couchdb': source => 'net', |