fix apache HTTP2HTTPS redirect config

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

diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf
index 7a735c2cc74010a597800dc0aa6c055b14131af9..2d254f0c5219502fcb9ee091e9b2c4a364b21229 100644 (file)
--- a/roles/email/templates/main.cf
+++ b/roles/email/templates/main.cf
@@ -39,14 +39,17 @@ 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
 postscreen_pipelining_enable = yes
 postscreen_non_smtp_command_enable = yes
 postscreen_bare_newline_enable = yes
        swl.spamhaus.org*-2 list.dnswl.org=127.0.[0..255].[0..254]*-2
 postscreen_greet_action = enforce
 postscreen_dnsbl_action = enforce
 postscreen_pipelining_enable = yes
 postscreen_non_smtp_command_enable = yes
 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


@@ -62,6 +65,11 @@ smtpd_recipient_restrictions = permit_mynetworks, permit_tls_clientcerts,
     reject_non_fqdn_recipient,
     reject_non_fqdn_sender,
 
     reject_non_fqdn_recipient,
     reject_non_fqdn_sender,
 

+# SMTP smuggling protection
+# <https://www.postfix.org/smtp-smuggling.html>
+smtpd_data_restrictions = reject_unauth_pipelining
+smtpd_discard_ehlo_keywords = chunking
+

 {% if postfix.relay_host is defined %}
 # Relay everything
 default_transport = smtp:{{ postfix.relay_host }}
 {% if postfix.relay_host is defined %}
 # Relay everything
 default_transport = smtp:{{ postfix.relay_host }}


@@ -139,4 +147,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