diff options
| author | varac <varacanero@zeromail.org> | 2013-10-11 17:54:55 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-11 17:54:55 +0200 |
| commit | 55d866039cbfa9baa0a0d42210467050c400bbbe (patch) | |
| tree | 729a70668c842a5aec77986bb02f4de1949692f2 /puppet/modules/site_postfix/manifests/mx.pp | |
| parent | 9890125a57c3a06792e8d08ba15f1b636c764c61 (diff) | |
| parent | 2a4ae58cc5e3f6e4a1e09ef6a9f15ade1e2c59fa (diff) | |
Merge branch 'feature/1683_configure_postfix_satellites' into develop
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx.pp')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index a043c277..474ed03d 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -3,10 +3,9 @@ class site_postfix::mx { $domain_hash = hiera ('domain') $domain = $domain_hash['full_suffix'] $host_domain = $domain_hash['full'] - $mx_hash = hiera('mx') $cert_name = hiera('name') - $root_mail_recipient = $mx_hash['contact'] + $root_mail_recipient = hiera ('contacts') $postfix_smtp_listen = 'all' include site_config::x509::cert @@ -32,7 +31,7 @@ class site_postfix::mx { } include site_postfix::mx::smtpd_checks - include site_postfix::checks + include site_postfix::mx::checks include site_postfix::mx::tls include site_postfix::mx::reserved_aliases |