diff options
| author | Micah Anderson <micah@leap.se> | 2013-09-03 12:30:07 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-09-03 12:30:07 -0400 |
| commit | b25d10864798e50dd51b9404903d3c493b44a65e (patch) | |
| tree | 7dfee18dfbac6b37fc24d0e5da20878a066ffe99 /puppet/modules/site_postfix/manifests/mx | |
| parent | 66fcf9bd9595a09d70e7d4131660340be5ae603e (diff) | |
| parent | cfdbad27fe0b1c5e98b127f2c3d22258e233ef11 (diff) | |
Merge branch 'feature/helo_access' into develop
Conflicts:
puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp
Change-Id: I51555935f9d9409e45809d6df021b10e926ea520
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp b/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp index 34cffb0d..b1536d64 100644 --- a/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp +++ b/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp @@ -3,6 +3,8 @@ class site_postfix::mx::smtpd_checks { postfix::config { 'smtpd_helo_required': value => 'yes'; + 'checks_dir': + value => '$config_directory/checks'; 'smtpd_client_restrictions': value => 'permit_mynetworks,permit'; 'smtpd_data_restrictions': @@ -10,7 +12,7 @@ class site_postfix::mx::smtpd_checks { 'smtpd_delay_reject': value => 'yes'; 'smtpd_helo_restrictions': - value => 'permit_mynetworks, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, permit'; + value => 'permit_mynetworks, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, check_helo_access hash:$checks_dir/helo_checks, permit'; 'smtpd_recipient_restrictions': value => 'reject_unknown_recipient_domain, permit_mynetworks, check_recipient_access tcp:localhost:2244, reject_unauth_destination, permit'; # We should change from permit_tls_all_clientcerts to permit_tls_clientcerts |