summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-04-02 15:38:54 -0700
committerelijah <elijah@riseup.net>2013-04-02 15:38:54 -0700
commitd2b525e0e471792ecc734b7b9f4f7ebcb98d868f (patch)
treec7f90bffed40f447d989518e1636216335761907 /provider_base/services
parent4ed5d33f33c488a6a6d5f6a5e8f57b74ecd53a7d (diff)
parent1750bec7032e90ddbe43da35eb5f49066187d1d4 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/couchdb.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index e60f4e0f..ce46e3bb 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -4,11 +4,14 @@
"use": true
},
"stunnel": {
- "couch_server": "= stunnel_server(couch.port)"
+ "couch_server": "= stunnel_server(couch.port)",
+ "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)",
+ "bigcouch_replication_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.port)"
},
"couch": {
"port": 5984,
"bigcouch": {
+ "port": 4369,
"cookie": "= secret :bigcouch_cookie"
},
"users": {