summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-11 17:54:55 +0200
committervarac <varacanero@zeromail.org>2013-10-11 17:54:55 +0200
commit55d866039cbfa9baa0a0d42210467050c400bbbe (patch)
tree729a70668c842a5aec77986bb02f4de1949692f2 /provider_base
parent9890125a57c3a06792e8d08ba15f1b636c764c61 (diff)
parent2a4ae58cc5e3f6e4a1e09ef6a9f15ade1e2c59fa (diff)
Merge branch 'feature/1683_configure_postfix_satellites' into develop
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/common.json6
-rw-r--r--provider_base/services/mx.json3
2 files changed, 5 insertions, 4 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 2313bd8b..5be0dd70 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",
@@ -35,5 +36,8 @@
},
"name": "common",
"location": null,
- "enabled": true
+ "enabled": true,
+ "mail": {
+ "smarthost": "= nodes_like_me[:services => :mx].exclude(self).field('domain.full')"
+ }
}
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)"
},