# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1478292922 0
# Node ID 9af4b04c266782ed343649b6390635ad52eb3ed1
# Parent  0dd899a10ee1abab4ac46378cd08c735fd44bcdb
Remove (hopefully) redundant Spamhaus checks - Postscreen should do this

diff -r 0dd899a10ee1 -r 9af4b04c2667 modules/postfix/templates/main.cf.erb
--- 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