From 80172de8a301c3befa26ac25c5e858f070bb2040 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 10 Oct 2013 18:09:32 +0200 Subject: provide global.provider.contacts.default on every node, no need to add in services/mx.json again --- provider_base/common.json | 1 + provider_base/services/mx.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'provider_base') 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)" }, -- cgit v1.2.3 From 1d080ba042d9ce55c4eaad6d35f7fffefccdbbca Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 10 Oct 2013 18:30:44 +0200 Subject: added mail.smarthost variable to hiera --- provider_base/common.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'provider_base') diff --git a/provider_base/common.json b/provider_base/common.json index 7ccb5005..5be0dd70 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -36,5 +36,8 @@ }, "name": "common", "location": null, - "enabled": true + "enabled": true, + "mail": { + "smarthost": "= nodes_like_me[:services => :mx].exclude(self).field('domain.full')" + } } -- cgit v1.2.3