summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-03-19 16:37:56 -0400
committerMicah Anderson <micah@riseup.net>2013-03-19 16:37:56 -0400
commitfe8085f670eb3bca10c5bb0d9890e00a0d9c59d9 (patch)
tree97b25cc1f18ff876f283de505e31810f82e47d44 /puppet
parentf1b405b503a76526551ac0110cad8798de46dfd8 (diff)
configure webapp haproxy couchdb connection
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp6
-rw-r--r--puppet/modules/site_webapp/templates/couchdb.yml.erb2
2 files changed, 3 insertions, 5 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 095cdb9d..820cc1d2 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -6,11 +6,9 @@ class site_webapp::couchdb {
$ca = $x509['ca_cert']
$webapp = hiera('webapp')
$couchdb_hosts = $webapp['couchdb_hosts']
- # for now, pick the first couchdb host before we have a working
- # load balancing setup (see https://leap.se/code/issues/1994)
- # which is configured through a stunnel connection, reachable
- # through localhost:5000
+ # haproxy listener on port localhost:4096, see site_webapp::haproxy
$couchdb_host = 'localhost'
+ $couchdb_port = '4096'
$couchdb_user = $webapp['couchdb_user']['username']
$couchdb_password = $webapp['couchdb_user']['password']
diff --git a/puppet/modules/site_webapp/templates/couchdb.yml.erb b/puppet/modules/site_webapp/templates/couchdb.yml.erb
index 3ae255b0..4855abd8 100644
--- a/puppet/modules/site_webapp/templates/couchdb.yml.erb
+++ b/puppet/modules/site_webapp/templates/couchdb.yml.erb
@@ -2,7 +2,7 @@ production:
prefix: ""
protocol: 'http'
host: <%= @couchdb_host %>
- port: 5000
+ port: <%= @couchdb_port %>
auto_update_design_doc: false
username: <%= @couchdb_user %>
password: <%= @couchdb_password %>