summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--provider_base/services/mx.json3
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp8
2 files changed, 7 insertions, 4 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index 949374ad..b15bfbc8 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -1,4 +1,7 @@
{
+ "mx": {
+ "contact": "= global.provider.contacts.default"
+ },
"stunnel": {
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
},
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 9104c2cb..15449001 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -1,10 +1,10 @@
class site_postfix::mx {
- $domain_hash = hiera ('domain')
- $domain = $domain_hash['full_suffix']
+ $domain_hash = hiera ('domain')
+ $domain = $domain_hash['full_suffix']
+ $mx_hash = hiera('mx')
- # see https://leap.se/code/issues/1936 for contact email addr
- #$root_mail_recipient = ''
+ $root_mail_recipient = $mx_hash['contact']
$postfix_smtp_listen = 'all'
postfix::config {