summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-03-14 18:46:03 -0400
committerMicah Anderson <micah@riseup.net>2013-03-14 18:46:10 -0400
commit068a2f13f4c26ad0d0965a5a951058a931fc10c6 (patch)
tree3c539574e4b48700cb8f1f6aaccb5868de1d4d94 /services
parentd6473c8c000bf3876ec076de1299ed298f67b17e (diff)
change webapp.json keys to match the stunnel::service ones so that they are passed through better
Diffstat (limited to 'services')
-rw-r--r--services/webapp.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/webapp.json b/services/webapp.json
index 76a596f..dc9a970 100644
--- a/services/webapp.json
+++ b/services/webapp.json
@@ -3,8 +3,8 @@
"couchdb_user": "= global.services[:couchdb].couch.users[:admin]",
"couchdb_hosts": "= hostnames nodes_like_me[:services => :couchdb]"
},
- "stunnel": "= nextport = 5000; nodes_like_me[:services => :couchdb].values.inject({}) {|hsh, node| hsh[node.name + node.couch.port.to_s] = {'host' => node.domain.name, 'port' => node.couch.port, 'local_port' => nextport}; nextport+=1; hsh}",
+ "stunnel": "= nextport = 5000; nodes_like_me[:services => :couchdb].values.inject({}) {|hsh, node| hsh[node.name + node.couch.port.to_s] = {'accept_port' => nextport.to_s, 'connect' => node.domain.name}; nextport+=1; hsh}",
"haproxy": {
"local_ports": "= stunnel.values.collect {|i|i['local_port']}"
}
-} \ No newline at end of file
+}