summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-03-15 18:25:41 +0000
committerVarac <varac@leap.se>2017-03-15 18:25:41 +0000
commit8b9cf218766e0075102db09562293835ab73f432 (patch)
tree67ef14ec1748ce68bc9751d2fa0d2a1bf9baf7f1 /provider_base
parente4a2d54b3571a8f4ce46485db762acbc4b919d84 (diff)
parent8c1c4c102936dd779c74d615763e7adef7033ec1 (diff)
Merge branch '8144_remove_haproxy' into 'master'
8144 remove haproxy Closes #8144 See merge request !70
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/services/mx.json7
-rw-r--r--provider_base/services/webapp.json7
2 files changed, 2 insertions, 12 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index 334e40de..480d7c6e 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -19,17 +19,12 @@
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
}
},
- "haproxy": {
- "couch": {
- "listen_port": 4096,
- "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.clients.couch_client, global.services[:couchdb].couch.port)"
- }
- },
"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"
},
+ "couchdb_port": "= couchdb_port",
"mynetworks": "= host_ips(nodes)",
"rbls": ["zen.spamhaus.org"],
"clamav": {
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index feca9524..064d5b1a 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -11,6 +11,7 @@
"tickets", "vmail", "www-data"],
"domain": "= provider.domain",
"modules": ["user", "billing", "help"],
+ "couchdb_port": "= couchdb_port",
"couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
"couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
"customization_dir": "= file_path 'webapp'",
@@ -45,12 +46,6 @@
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
}
},
- "haproxy": {
- "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",
"eip_service": "= file [:eip_service_json_template, 'v'+webapp.api_version.to_s]",