install_postfix_advanced.sh,install_amavis.sh: fix some error creating master.cf.

This commit is contained in:
2022-09-26 02:54:07 +02:00
parent 6eb955b34e
commit ecb0037e16
2 changed files with 50 additions and 2 deletions

View File

@ -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