summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2016-01-27 12:22:53 +0100
committerkwadronaut <kwadronaut@leap.se>2016-02-10 11:45:05 +0100
commitbd8b87f076db5e800de39e570a6b42976be40435 (patch)
tree24fbdef2d7a743e8c7fb858e7871e8a31841a638 /puppet
parent81ab07d79a56c6b44d2ca16fb51af2a0e8d09098 (diff)
add postscreen greeter (Resolves: 2303)
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp10
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 02b9fbdd..59a02598 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
@@ -79,6 +80,10 @@ class site_postfix::mx {
value => 'smtp';
'mailbox_command':
value => '';
+ 'postscreen_access_list':
+ value => 'permit_mynetworks';
+ 'postscreen_greet_action':
+ value => 'enforce';
}
include site_postfix::mx::smtpd_checks
@@ -118,6 +123,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'],