diff options
| author | elijah <elijah@riseup.net> | 2015-08-31 12:22:56 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-08-31 12:22:56 -0700 |
| commit | be8f7335cc273f85a1949557962dd65d88548679 (patch) | |
| tree | 4fd4fdbed428f62358c1e930722f0b02a66b294b /puppet/modules/site_postfix/manifests/mx.pp | |
| parent | 4f42910a6792ec3016aa6f9d0792801f75972a62 (diff) | |
| parent | b5fbda1ca3832043e1636ee964a806ff222cb05f (diff) | |
Merge branch 'feature/mxalias' into develop
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx.pp')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index af0f9f56..334d04d0 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -51,7 +51,7 @@ class site_postfix::mx { include site_postfix::mx::checks include site_postfix::mx::smtp_tls include site_postfix::mx::smtpd_tls - include site_postfix::mx::reserved_aliases + include site_postfix::mx::static_aliases # greater verbosity for debugging, take out for production #include site_postfix::debug @@ -68,6 +68,7 @@ class site_postfix::mx { preseed => true, root_mail_recipient => $root_mail_recipient, smtp_listen => 'all', + default_alias_maps => false, mastercf_tail => "smtps inet n - - - - smtpd -o smtpd_tls_wrappermode=yes |