summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-09-20 12:15:36 -0700
committerelijah <elijah@riseup.net>2013-09-20 12:15:36 -0700
commitd7f5b368547f37cfa53cd606f3d72fab44b6bd7f (patch)
tree947963585a525b85952d91515b40aad418ab21bc /provider_base
parent3d4960e59c1c742fc0706b37a40e03b698865587 (diff)
use newer haproxy_servers macro in order to allow couchdb and webapp to be on the same node (requires latest leap_cli)
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/services/webapp.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index e47f047b..6f2beb8a 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -20,8 +20,7 @@
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
},
"haproxy": {
- "local_ports": "= stunnel.couch_client.field(:accept_port)",
- "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)"
+ "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client, global.services[:couchdb].couch.port)"
},
"definition_files": {
"provider": "= file :provider_json_template",