adjust patterns after sysupgrade

[ansible.git] / roles / email / templates / main.cf

diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf
index b9d2187e237e6a25d09c2a09c49568330ee7ff50..45c77d39d937f50e69ffd8f7a2ce1934df07a4d3 100644 (file)
--- a/roles/email/templates/main.cf
+++ b/roles/email/templates/main.cf
@@ -39,8 +39,8 @@ smtp_tls_security_level = dane
 postscreen_dnsbl_threshold = 3
 postscreen_dnsbl_whitelist_threshold = -2
 postscreen_dnsbl_sites =
 postscreen_dnsbl_threshold = 3
 postscreen_dnsbl_whitelist_threshold = -2
 postscreen_dnsbl_sites =

-       ix.dnsbl.manitu.net*2 sbl-xbl.spamhaus.org*2
-       bl.spamcop.net dnsbl.sorbs.net bl.mailspike.net
+       ix.dnsbl.manitu.net*2 sbl-xbl.spamhaus.org*3 truncate.gbudb.net*2
+       bl.spamcop.net bl.mailspike.net

        swl.spamhaus.org*-2 list.dnswl.org=127.0.[0..255].[0..254]*-2
 postscreen_greet_action = enforce
 postscreen_dnsbl_action = enforce
        swl.spamhaus.org*-2 list.dnswl.org=127.0.[0..255].[0..254]*-2
 postscreen_greet_action = enforce
 postscreen_dnsbl_action = enforce


@@ -49,6 +49,7 @@ postscreen_non_smtp_command_enable = yes
 postscreen_bare_newline_enable = yes
 postscreen_access_list = permit_mynetworks,
        cidr:$config_directory/postscreen_access.cidr
 postscreen_bare_newline_enable = yes
 postscreen_access_list = permit_mynetworks,
        cidr:$config_directory/postscreen_access.cidr

+postscreen_blacklist_action = enforce

 {% endif %}
 
 # control relay access
 {% endif %}
 
 # control relay access


@@ -141,4 +142,4 @@ smtpd_delay_reject = yes
 disable_vrfy_command = yes
 recipient_delimiter = {{ postfix.recipient_delimiter | default("+") }}
 delay_warning_time = 4h
 disable_vrfy_command = yes
 recipient_delimiter = {{ postfix.recipient_delimiter | default("+") }}
 delay_warning_time = 4h

-message_size_limit = 21384000
+message_size_limit = 30100100