From 6521b03aa2afd9154cc94a0823d5c306fe971436 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 8 Dec 2025 23:44:29 +0100 Subject: [PATCH] install_amavis.sh: adjust printing master.cf. --- install_amavis.sh | 54 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/install_amavis.sh b/install_amavis.sh index 83372ab..cc540cd 100755 --- a/install_amavis.sh +++ b/install_amavis.sh @@ -5016,13 +5016,9 @@ localhost:10025 inet n - y - - smtpd -o mynetworks=127.0.0.0/8,[::1]/128 -o receive_override_options=no_unknown_recipient_checks EOF - if [[ -n "$(which opendkim)" && -n "$(which opendmarc)" ]] ; then + if [[-n "$(which opendmarc)" ]] ; then cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock -EOF - elif [[ -n "$(which opendkim)" ]] ; then - cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock + -o smtpd_milters=local:/opendmarc/opendmarc.sock EOF fi cat >> $postfix_master_cf << EOF @@ -5042,6 +5038,13 @@ submission inet n - y - 20 smtpd -o smtpd_tls_security_level=encrypt -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 + -o smtpd_milters=local:/opendkim/opendkim.sock +EOF + fi + cat >> $postfix_master_cf << EOF #-o milter_macro_daemon_name=ORIGINATING EOF if ! $smtps_present ; then @@ -5059,13 +5062,9 @@ localhost:10025 inet n - y - - smtpd -o mynetworks=127.0.0.0/8,[::1]/128 -o receive_override_options=no_unknown_recipient_checks EOF - if [[ -n "$(which opendkim)" && -n "$(which opendmarc)" ]] ; then + if [[ -n "$(which opendmarc)" ]] ; then cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock -EOF - elif [[ -n "$(which opendkim)" ]] ; then - cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock + -o smtpd_milters=local:/opendmarc/opendmarc.sock EOF fi cat >> $postfix_master_cf << EOF @@ -5096,6 +5095,13 @@ smtps inet n - y - - smtpd -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 + -o smtpd_milters=local:/opendkim/opendkim.sock +EOF + fi + cat >> $postfix_master_cf << EOF #-o milter_macro_daemon_name=ORIGINATING EOF @@ -5113,15 +5119,11 @@ localhost:10025 inet n - y - - smtpd -o mynetworks=127.0.0.0/8,[::1]/128 -o receive_override_options=no_unknown_recipient_checks EOF - if [[ -n "$(which opendkim)" && -n "$(which opendmarc)" ]] ; then + if [[ -n "$(which opendmarc)" ]] ; then cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock + -o smtpd_milters=local:/opendmarc/opendmarc.sock EOF - elif [[ -n "$(which opendkim)" ]] ; then - cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock -EOF - fi + fi cat >> $postfix_master_cf << EOF #-o mynetworks=127.0.0.0/8,[::1]/128,${IPV4}/32 EOF @@ -5156,16 +5158,12 @@ localhost:10025 inet n - y - - smtpd -o mynetworks=127.0.0.0/8,[::1]/128 -o receive_override_options=no_unknown_recipient_checks EOF - if [[ -n "$(which opendkim)" && -n "$(which opendmarc)" ]] ; then - cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock -EOF - elif [[ -n "$(which opendkim)" ]] ; then - cat >> $postfix_master_cf << EOF - -o smtpd_milters=local:/opendkim/opendkim.sock -EOF - fi + if [[ -n "$(which opendmarc)" ]] ; then cat >> $postfix_master_cf << EOF + -o smtpd_milters=local:/opendmarc/opendmarc.sock +EOF + fi + cat >> $postfix_master_cf << EOF #-o mynetworks=127.0.0.0/8,[::1]/128,${IPV4}/32 EOF continue