summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-18 18:24:16 +0100
committervarac <varacanero@zeromail.org>2013-03-18 18:24:16 +0100
commitfbae857865f3e2d61d9e55693c5cce411f7565ca (patch)
tree15831e6a34ac7ae1974267ec60822084c12ab4d6
parent6609b3ed4125d1e46ba16b5bc7d7957bcbee6a42 (diff)
Webapp: Use stunnel localhost:5000 for couchdb connection
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp4
-rw-r--r--puppet/modules/site_webapp/templates/couchdb.yml.erb4
2 files changed, 5 insertions, 3 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index b8a4201d..f3488227 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -8,7 +8,9 @@ class site_webapp::couchdb {
$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)
- $couchdb_host = $couchdb_hosts[0]
+ # which is configured through a stunnel connection, reachable
+ # through localhost:5000
+ $couchdb_host = 'localhost'
$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 ee521713..d9ecb4b2 100644
--- a/puppet/modules/site_webapp/templates/couchdb.yml.erb
+++ b/puppet/modules/site_webapp/templates/couchdb.yml.erb
@@ -1,8 +1,8 @@
production:
prefix: ""
- protocol: 'https'
+ protocol: 'http'
host: <%= @couchdb_host %>
- port: 6984
+ port: 5000
username: <%= @couchdb_user %>
password: <%= @couchdb_password %>