Merge branch 'postfix-cleanup' into 'master'

postfix: Remove special "fast-path" smtpd + Remove unneeded smtpd service that was used by SpamAssassin

Closes #321

See merge request !373

roles/matrix/templates/homeserver.yaml.j2

@@ -2364,7 +2364,7 @@ email:
 
   # The port on the mail server for outgoing SMTP. Defaults to 25.
   #
-  smtp_port: 10027
+  smtp_port: 25
 
   # Username/password for authentication to the SMTP server. By default, no
   # authentication is attempted.

roles/postfix/templates/main.cf.j2

@@ -121,13 +121,6 @@ smtpd_recipient_restrictions =
 # some rate limiting rules only work after data so check it again
 smtpd_end_of_data_restrictions =
   $policy_check
-
-# needed to put our users on HOLD
-# this is used in master.cf as an argument to smtpd_recipient_restrictions
-post_queue_smtpd_recipient_restrictions =
-  check_sender_access ${indexed}/access_sender-post-filter,
-  permit_mynetworks,
-  reject
 {% endif %}
 
 address_verify_map = ${default_database_type}:/var/lib/postfix/verify_cache

roles/postfix/templates/master.cf.j2

@@ -95,45 +95,6 @@ lmtp      unix  -       -       n       -       -       lmtp
 anvil     unix  -       -       n       -       1       anvil
 scache    unix  -       -       n       -       1       scache
 
-{% if postfix_smtpd_public %}
-# After-filter SMTP server. Receive mail from the content filter
-# on localhost port 10026.
-#
-127.0.0.1:10026 inet n  -       n       -        -      smtpd
-        -o syslog_name=postfix/after-sa-smtp
-        -o smtpd_authorized_xforward_hosts=127.0.0.0/8
-        -o smtpd_client_restrictions=
-        -o smtpd_helo_restrictions=
-        -o smtpd_sender_restrictions=
-        -o smtpd_recipient_restrictions=$post_queue_smtpd_recipient_restrictions
-        -o smtpd_data_restrictions=
-        -o smtpd_end_of_data_restrictions=
-        -o mynetworks=127.0.0.0/8
-        -o receive_override_options=no_unknown_recipient_checks,no_milters
-        -o smtpd_tls_auth_only=no
-        -o smtpd_reject_footer=
-        -o smtpd_tls_security_level=none
-{% endif %}
-
-# a port listening on localhost only to allow local services (eg, webapps etc)
-# to relay mail without waiting for filtering checks etc that are applied to
-# port 25 connections. specifically, flyspray seems to send emails sequentially
-# so any delays in delivery cause noticable delays for users on the web ui.
-127.0.0.1:10027 inet n  -       n       -        -      smtpd
-        -o syslog_name=postfix/dkim-injector
-        -o smtpd_authorized_xforward_hosts=127.0.0.0/8
-        -o smtpd_client_restrictions=
-        -o smtpd_helo_restrictions=
-        -o smtpd_sender_restrictions=
-        -o smtpd_recipient_restrictions=$post_queue_smtpd_recipient_restrictions
-        -o smtpd_data_restrictions=
-        -o smtpd_end_of_data_restrictions=
-        -o mynetworks=127.0.0.0/8
-        -o receive_override_options=no_unknown_recipient_checks
-        -o smtpd_tls_auth_only=no
-        -o smtpd_reject_footer=
-        -o smtpd_tls_security_level=none
-
 {% if postfix_patchwork_enabled %}
 patchwork   unix  -       n       n       -       -       pipe
   flags=DFRX user={{postfix_patchwork_user}} argv={{postfix_patchwork_mail_handler}}