diff --git a/install_amavis.sh b/install_amavis.sh index 95d95ca..9e8c0cd 100755 --- a/install_amavis.sh +++ b/install_amavis.sh @@ -2342,7 +2342,7 @@ for _pkg in $_needed_packages_clamav ; do fi done if [[ -n "$needed_packages_clamav" ]]; then - DEBIAN_FRONTEND=noninteractive apt-get -y install $needed_packages_clamav > /dev/null 2> $tmp_err_msg + DEBIAN_FRONTEND=noninteractive apt-get -y install $needed_packages_clamav > $tmp_err_msg 2>&1 if [[ $? -eq 0 ]] ; then echo_ok else @@ -3601,13 +3601,14 @@ EOF if $smtps_present && echo "$_line" | grep -i -E "^smtps\s+" > /dev/null 2>&1 ; then + _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 milter_macro_daemon_name=ORIGINATING + #-o milter_macro_daemon_name=ORIGINATING EOF if ! $localhost_10025_present ; then