diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2020-10-08 17:46:35 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2020-10-08 17:46:35 +0200 |
| commit | 7d70c1683a9c6637cecfc4a7bcf7aa7683a9028c (patch) | |
| tree | 2db4f110bce485adb8608e1c56a0fd7061817616 /postfix | |
| parent | 6cc2275d54defcf020891dcbd76c6cc2e18d0544 (diff) | |
use amavis injection service name amavisfeed (not smtp-amavis), and use lmtp (not smtp)
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 00d0f48..225bc09 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -318,11 +318,11 @@ fi if [ -n "$amavis" ]; then $postconf -c "$tempdir" -e 'max_use = 10' # Avoid too much reuse amavis_maxproc=$(getperlvarfromfile max_servers "$default_amavis_maxproc" amavisd.conf.addon amavis) - addoroverwritewithindents $tempdir/master.cf '^smtp-amavis\h' << EOF -smtp-amavis unix - - n - $amavis_maxproc smtp - -o smtp_data_done_timeout=1200s - -o smtp_never_send_ehlo=yes - -o smtp_send_xforward_command=yes + addoroverwritewithindents $tempdir/master.cf '^amavisfeed\h' << EOF +amavisfeed unix - - n - $amavis_maxproc lmtp + -o lmtp_data_done_timeout=1200s + -o lmtp_never_send_ehlo=yes + -o lmtp_send_xforward_command=yes -o disable_dns_lookups=yes -o max_use=20 EOF @@ -348,7 +348,7 @@ EOF -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_milters EOF if [ -n "$dkimproxy" ]; then - $postconf -c "$tempdir" -e 'content_filter = smtp-amavis:[127.0.0.1]:10028' + $postconf -c "$tempdir" -e 'content_filter = amavisfeed:[127.0.0.1]:10028' $postconf -c "$tempdir" -e receive_override_options=no_address_mappings addoroverwritewithindents $tempdir/master.cf '^submission\h' << EOF submission inet n - n - - smtpd @@ -379,7 +379,7 @@ EOF -o smtpd_authorized_xforward_hosts=127.0.0.0/8 EOF else - $postconf -c "$tempdir" -e 'content_filter = smtp-amavis:[127.0.0.1]:10024' + $postconf -c "$tempdir" -e 'content_filter = amavisfeed:[127.0.0.1]:10024' $postconf -c "$tempdir" -e 'receive_override_options = no_address_mappings' addoroverwritewithindents $tempdir/master.cf '^submission\h' << EOF submission inet n - n - - smtpd @@ -446,8 +446,8 @@ fi # Support for trusted MX backup networks added # PCRE stuff avoided, as PCRE is only optional on newest Debian packages # RBLs replaced with those recommended by http://www.antispews.org/ -# spam filter based on this: http://www.postfix.org/FILTER_README.html -# adapted to use AMaViS on port 10024 +# spam filter based on these: http://www.postfix.org/FILTER_README.html +# https://www.ijs.si/software/amavisd/amavisd-new-docs.html # AUTH-SMTP based on this: http://www.postfix.org/SASL_README.html # Here's a convenient overview of different blackholes: |