diff options
| author | kwadronaut <kwadronaut@leap.se> | 2016-02-12 00:45:46 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-02-12 00:45:46 +0100 |
| commit | 8009b9ed312837d7e13889fdb440eeeb2b1018c8 (patch) | |
| tree | 705a1301607ac22ed91e5896323c66f6b852d8c7 /puppet/modules | |
| parent | fdc4b570649a5a9f1f3e1bd873197f9defc85100 (diff) | |
| parent | bd8b87f076db5e800de39e570a6b42976be40435 (diff) | |
add postscreen greeter (Resolves: 2303)
Conflicts:
puppet/modules/site_postfix/manifests/mx.pp
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index c4ab1bba..2ea54d0a 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -10,8 +10,9 @@ class site_postfix::mx { $mynetworks = join(hiera('mynetworks', ''), ' ') $rbls = suffix(prefix(hiera('rbls', []), 'reject_rbl_client '), ',') - $root_mail_recipient = hiera('contacts') - $postfix_smtp_listen = 'all' + $root_mail_recipient = hiera('contacts') + $postfix_smtp_listen = 'all' + $postfix_use_postscreen = 'yes' include site_config::x509::cert include site_config::x509::key @@ -81,6 +82,10 @@ class site_postfix::mx { value => ''; 'header_checks': value => ''; + 'postscreen_access_list': + value => 'permit_mynetworks'; + 'postscreen_greet_action': + value => 'enforce'; } include ::site_postfix::mx::smtpd_checks @@ -121,6 +126,7 @@ clean_smtps unix n - n - 0 cleanup root_mail_recipient => $root_mail_recipient, smtp_listen => 'all', mastercf_tail => $mastercf_tail, + use_postscreen => 'yes', require => [ Class['Site_config::X509::Key'], Class['Site_config::X509::Cert'], |