summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-10 18:09:32 +0200
committervarac <varacanero@zeromail.org>2013-10-10 18:09:32 +0200
commit80172de8a301c3befa26ac25c5e858f070bb2040 (patch)
treed587d652218985f5c9207280c37e253f0b5e791a /provider_base
parent9890125a57c3a06792e8d08ba15f1b636c764c61 (diff)
provide global.provider.contacts.default on every node, no need to add in services/mx.json again
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/common.json1
-rw-r--r--provider_base/services/mx.json3
2 files changed, 1 insertions, 3 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 2313bd8b..7ccb5005 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -3,6 +3,7 @@
"environment": null,
"services": [],
"tags": [],
+ "contacts": "= global.provider.contacts.default",
"domain": {
"full_suffix": "= global.provider.domain",
"internal_suffix": "= global.provider.domain_internal",
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index f999dd23..7b0aa57b 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -1,7 +1,4 @@
{
- "mx": {
- "contact": "= global.provider.contacts.default"
- },
"stunnel": {
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
},