Mercurial > repos > other > Puppet

changeset 132:9af4b04c2667 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove (hopefully) redundant Spamhaus checks - Postscreen should do this
author IBBoard <dev@ibboard.co.uk>
date Fri, 04 Nov 2016 20:55:22 +0000
parents 0dd899a10ee1
children 9337c9ce648a
files modules/postfix/templates/main.cf.erb
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/postfix/templates/main.cf.erb	Wed Oct 26 19:40:37 2016 +0100
+++ b/modules/postfix/templates/main.cf.erb	Fri Nov 04 20:55:22 2016 +0000
@@ -58,9 +58,9 @@
 virtual_alias_maps = hash:/etc/postfix/valias
 recipient_bcc_maps = hash:/etc/postfix/recipient_bcc
 smtpd_helo_required = yes
-smtpd_helo_restrictions  = permit_mynetworks, reject_invalid_helo_hostname, check_helo_access hash:/etc/postfix/helo_whitelist, reject_rhsbl_helo zen.spamhaus.org, permit
+smtpd_helo_restrictions  = permit_mynetworks, reject_invalid_helo_hostname, check_helo_access hash:/etc/postfix/helo_whitelist, permit
 smtpd_sender_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_non_fqdn_sender, reject_unknown_sender_domain, permit
-smtpd_recipient_restrictions = reject_invalid_hostname, reject_non_fqdn_sender, reject_non_fqdn_recipient, reject_unknown_sender_domain, permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, check_sender_access hash:/etc/postfix/sender_access, check_recipient_access hash:/etc/postfix/valias-blacklist, check_recipient_access regexp:/etc/postfix/valias-blacklist-regex, reject_rbl_client zen.spamhaus.org, check_policy_service unix:private/policy
+smtpd_recipient_restrictions = reject_invalid_hostname, reject_non_fqdn_sender, reject_non_fqdn_recipient, reject_unknown_sender_domain, permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, check_sender_access hash:/etc/postfix/sender_access, check_recipient_access hash:/etc/postfix/valias-blacklist, check_recipient_access regexp:/etc/postfix/valias-blacklist-regex, check_policy_service unix:private/policy
 smtpd_data_restrictions = reject_unauth_pipelining
 transport_maps = hash:/etc/postfix/transport
 message_size_limit = 15000000