summaryrefslogtreecommitdiff
path: root/provider_base/services/mx.json
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-02-27 11:57:54 -0800
committerelijah <elijah@riseup.net>2014-02-27 11:59:32 -0800
commite8cd9ab2d4480aa7c16d15f5db664fa650d4c655 (patch)
tree380e9c974240d95f3c2b7b963a486a3af64a7783 /provider_base/services/mx.json
parent488022986a54f6031d4547701031c7b0017e729c (diff)
fixed more places where passwords were set to the wrong environment.
Diffstat (limited to 'provider_base/services/mx.json')
-rw-r--r--provider_base/services/mx.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index d57c3168..7e3f20ba 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -5,7 +5,11 @@
"haproxy": {
"servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)"
},
- "couchdb_leap_mx_user": "= global.services[:couchdb].couch.users[:leap_mx]",
+ "couchdb_leap_mx_user": {
+ "username": "= global.services[:couchdb].couch.users[:leap_mx].username",
+ "password": "= secret :couch_leap_mx_password",
+ "salt": "= hex_secret :couch_leap_mx_password_salt, 128"
+ },
"mx_nodes": "= nodes['services' => 'mx']['environment' => '!local'].field('ip_address')",
"x509": {
"use": true,