diff options
| author | elijah <elijah@riseup.net> | 2014-06-21 02:51:51 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-21 02:51:51 -0700 |
| commit | 56917469bd20293dda7e4187c01d822d42ee98cd (patch) | |
| tree | 6aa9cf0f80e10a918770e3e8b6408b679ae0ad1b | |
| parent | 73ef324c993f03b2b8f47418f8b2cf7ff97314c6 (diff) | |
fix stunnel entries in mx.json and webapp.json
| -rw-r--r-- | provider_base/services/mx.json | 9 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 731dee9a..d28f03ed 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -1,9 +1,14 @@ { "stunnel": { - "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" + "clients": { + "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" + } }, "haproxy": { - "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)" + "couch": { + "listen_port": 4096, + "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.clients.couch_client)" + } }, "couchdb_leap_mx_user": { "username": "= global.services[:couchdb].couch.users[:leap_mx].username", diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index bbb52094..9f319910 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -29,10 +29,15 @@ } }, "stunnel": { - "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" + "clients": { + "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" + } }, "haproxy": { - "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client, global.services[:couchdb].couch.port)" + "couch": { + "listen_port": 4096, + "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.clients.couch_client, global.services[:couchdb].couch.port)" + } }, "definition_files": { "provider": "= file :provider_json_template", |