From 68d2bd18b748da28a5dc32605ba86044caea0aae Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 9 Dec 2025 00:01:31 +0100 Subject: [PATCH] install_amavis.sh: some minor changes. --- install_amavis.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/install_amavis.sh b/install_amavis.sh index cc540cd..d76f963 100755 --- a/install_amavis.sh +++ b/install_amavis.sh @@ -5075,9 +5075,9 @@ EOF if ! $amavisfeed_present ; then cat >> $postfix_master_cf << EOF amavisfeed unix - - n - 20 lmtp - -o smtp_data_done_timeout=1200 - -o smtp_send_xforward_command=yes - -o disable_dns_lookups=yes + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + -o disable_dns_lookups=yes EOF fi fi # if ! $smtps_present @@ -5091,10 +5091,10 @@ EOF _found=true cat >> $postfix_master_cf << EOF smtps inet n - y - - smtpd - -o content_filter=amavisfeed:[127.0.0.1]:10024 - -o smtpd_tls_wrappermode=yes - -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o content_filter=amavisfeed:[127.0.0.1]:10024 + -o smtpd_tls_wrappermode=yes + -o smtpd_sasl_auth_enable=yes + -o smtpd_client_restrictions=permit_sasl_authenticated,reject EOF if [[ -n "$(which opendkim)" ]] ; then cat >> $postfix_master_cf << EOF @@ -5102,7 +5102,7 @@ EOF EOF fi cat >> $postfix_master_cf << EOF - #-o milter_macro_daemon_name=ORIGINATING + #-o milter_macro_daemon_name=ORIGINATING EOF if ! $localhost_10025_present ; then @@ -5132,9 +5132,9 @@ EOF if ! $amavisfeed_present ; then cat >> $postfix_master_cf << EOF amavisfeed unix - - n - 20 lmtp - -o smtp_data_done_timeout=1200 - -o smtp_send_xforward_command=yes - -o disable_dns_lookups=yes + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + -o disable_dns_lookups=yes EOF fi @@ -5173,9 +5173,9 @@ EOF _found=true cat >> $postfix_master_cf << EOF amavisfeed unix - - n - 20 lmtp - -o smtp_data_done_timeout=1200 - -o smtp_send_xforward_command=yes - -o disable_dns_lookups=yes + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + -o disable_dns_lookups=yes EOF continue fi