summaryrefslogtreecommitdiff
path: root/provider_base/services/soledad.json
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-02-27 09:04:53 -0800
committervarac <varacanero@zeromail.org>2014-02-27 18:08:00 +0100
commit488022986a54f6031d4547701031c7b0017e729c (patch)
tree443c5cc611d08e3375228d0585a52d2944937c9a /provider_base/services/soledad.json
parentface1d929175b94e26ca11858e3b055873fdde92 (diff)
fixed horrible bug that caused all environments to use the same couchdb soledad password.
Diffstat (limited to 'provider_base/services/soledad.json')
-rw-r--r--provider_base/services/soledad.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json
index fc349ce1..ed6fbc9f 100644
--- a/provider_base/services/soledad.json
+++ b/provider_base/services/soledad.json
@@ -2,7 +2,11 @@
"soledad": {
"port": 2323,
"require_couchdb": "=> assert %(services.include? 'couchdb')",
- "couchdb_soledad_user": "= global.services[:couchdb].couch.users[:soledad]"
+ "couchdb_soledad_user": {
+ "username": "= global.services[:couchdb].couch.users[:soledad].username",
+ "password": "= secret :couch_soledad_password",
+ "salt": "= hex_secret :couch_soledad_password_salt, 128"
+ }
},
"service_type": "public_service"
}