Merge branch 'master' of git.oopen.de:install/mailsystem

install_amavis.sh

@@ -396,8 +396,13 @@ while [[ "$SASL_AUTH_ENABLED" != "yes" &&
       SASL_AUTH_ENABLED=${SASL_AUTH_ENABLED,,}
    fi
 
-   if [[ "$SASL_AUTH_ENABLED" != "yes" && "$SASL_AUTH_ENABLED" != "no" ]] ; then
+   [[ -z "${SASL_AUTH_ENABLED}" ]] && SASL_AUTH_ENABLED=${_SASL_AUTH_ENABLED}
-      _SASL_AUTH_ENABLED=""
+
+   if [[ "$SASL_AUTH_ENABLED" != "yes" &&
+         "$SASL_AUTH_ENABLED" != "true" &&
+         "$SASL_AUTH_ENABLED" != "false" &&
+         "$SASL_AUTH_ENABLED" != "no" ]] ; then
+      SASL_AUTH_ENABLED=""
       echo -e  "\n\t\033[33m\033[1mWrong entry!\033[m\n Type 'yes' or 'no'"
    fi
 

install_postfix_advanced.sh

@@ -3049,7 +3049,7 @@ else
 EOF
 fi
 
-if ${IS_SYMPA_LIST_SERVER} ; then
+if ${IS_SYMPA_LIST_SERVER} || ${IS_RELAY_HOST}; then
 
    cat <<EOF >> /etc/postfix/main.cf
 
@@ -4147,6 +4147,14 @@ else
    dmarc_pipe_present=false
 fi
 
+if ${LISTEN_ON_ADDITIONAL_RELAY_PORT} ; then
+   if grep -iq -E "^${ADDITIONAL_RELAY_LISTEN_PORT}\s+" $postfix_master_cf > /dev/null 2>&1 ; then
+      additional_relay_port_present=true
+   else
+      additional_relay_port_present=false
+   fi
+fi
+
 _found=false
 echononl "   Create new file \"${postfix_master_cf}\""
 if [[ -f "${postfix_master_cf}.$backup_date" ]]; then
@@ -4176,9 +4184,11 @@ smtps     inet  n       -       y       -       -       smtpd
 EOF
 				fi
          elif $LISTEN_ON_ADDITIONAL_RELAY_PORT ; then
-            cat >> $postfix_master_cf << EOF
+            if ! ${additional_relay_port_present} ; then
+               cat >> $postfix_master_cf << EOF
 ${ADDITIONAL_RELAY_LISTEN_PORT}      inet  n       -       y       -       -       smtpd
 EOF
+            fi
 			fi
 			continue
 		fi