diff --git a/install_amavis.sh b/install_amavis.sh index f492bc8..9a279ae 100755 --- a/install_amavis.sh +++ b/install_amavis.sh @@ -4837,6 +4837,17 @@ localhost:10025 inet n - y - - smtpd -o smtpd_data_restrictions= -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 + cat >> $postfix_master_cf << EOF #-o mynetworks=127.0.0.0/8,[::1]/128,${IPV4}/32 EOF fi @@ -4869,6 +4880,17 @@ localhost:10025 inet n - y - - smtpd -o smtpd_data_restrictions= -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 + cat >> $postfix_master_cf << EOF #-o mynetworks=127.0.0.0/8,[::1]/128,${IPV4}/32 EOF fi @@ -4912,6 +4934,17 @@ localhost:10025 inet n - y - - smtpd -o smtpd_data_restrictions= -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 + cat >> $postfix_master_cf << EOF #-o mynetworks=127.0.0.0/8,[::1]/128,${IPV4}/32 EOF fi @@ -4944,6 +4977,17 @@ localhost:10025 inet n - y - - smtpd -o smtpd_data_restrictions= -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 + cat >> $postfix_master_cf << EOF #-o mynetworks=127.0.0.0/8,[::1]/128,${IPV4}/32 EOF continue diff --git a/install_postfix_advanced.sh b/install_postfix_advanced.sh index abee50f..38d613a 100755 --- a/install_postfix_advanced.sh +++ b/install_postfix_advanced.sh @@ -438,7 +438,7 @@ if $IS_RELAY_HOST ; then echo -e "\tConfigure as relay host?..........: \033[33m\033[1m$IS_RELAY_HOST\033[m" echo -e "\tConfigure as complete mailserver..: false" echo "" - echo -e "\tConfigure as sympa list server?...: $IS_SYMPA_LIST_SERVER" + echo -e "\tConfigure as sympa list server?...: \033[33m\033[1m$IS_SYMPA_LIST_SERVER\033[m" echo "" echo -e "\tSupport Cyrus SASL authentication.: $SASL_AUTH_ENABLED" else @@ -3252,7 +3252,11 @@ if [[ -n "$(which opendkim)" ]] ; then while IFS='' read -r _line || [[ -n $_line ]] ; do if $_found && ! echo "$_line" | grep -i -q -E "^\s*-o" 2> /dev/null ; then - echo " -o smtpd_milters=local:/opendkim/opendkim.sock" >> "$tmp_master_file" + if [[ -n "$(which opendmarc)" ]] ; then + echo " -o smtpd_milters=local:/opendkim/opendkim.sock,local:/opendmarc/opendmarc.sock" >> "$tmp_master_file" + else + echo " -o smtpd_milters=local:/opendkim/opendkim.sock" >> "$tmp_master_file" + fi _changed=true _found=false fi