install/mailsystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christoph
2026-02-18 18:48:01 +01:00
parent 1ca6031fea 8234254094
commit 691c34fa18
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install_amavis.sh
View File

@@ -396,8 +396,13 @@ while [[ "$SASL_AUTH_ENABLED" != "yes" &&
SASL_AUTH_ENABLED=${SASL_AUTH_ENABLED,,} SASL_AUTH_ENABLED=${SASL_AUTH_ENABLED,,}
fi 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'" echo -e "\n\t\033[33m\033[1mWrong entry!\033[m\n Type 'yes' or 'no'"
fi fi

31
install_postfix_advanced.sh
View File

@@ -2146,9 +2146,24 @@ smtp_tls_security_level=dane
smtpd_tls_loglevel = 1 smtpd_tls_loglevel = 1
smtp_tls_loglevel = 1 smtp_tls_loglevel = 1
# TLS RSA keys path
smtpd_tls_cert_file = $_TLS_CERT_FILE smtpd_tls_cert_file = $_TLS_CERT_FILE
smtpd_tls_key_file = $_TLS_KEY_FILE smtpd_tls_key_file = $_TLS_KEY_FILE
EOF
if [[ -f "/etc/postfix/ssl/mailserver-ecdsa.crt" &&
-f "/etc/postfix/ssl/mailserver-ecdsa.key" ]] ; then
cat <<EOF >> /etc/postfix/main.cf
# TLS ECDSA keys path
smtpd_tls_eccert_file = /etc/postfix/ssl/mailserver-ecdsa.crt
smtpd_tls_eckey_file = /etc/postfix/ssl/mailserver-ecdsa.key
EOF
fi
cat <<EOF >> /etc/postfix/main.cf
## - File with DH parameters that the Postfix SMTP server should use with EDH ciphers. ## - File with DH parameters that the Postfix SMTP server should use with EDH ciphers.
## - ## -
@@ -2716,7 +2731,7 @@ EOF
if [[ -n "$(which postfwd)" ]] ; then if [[ -n "$(which postfwd)" ]] ; then
cat <<EOF >> /etc/postfix/main.cf cat <<EOF >> /etc/postfix/main.cf
127.0.0.1:10040_time_limit = 3600 #127.0.0.1:10040_time_limit = 3600
EOF EOF
else else
cat <<EOF >> /etc/postfix/main.cf cat <<EOF >> /etc/postfix/main.cf
@@ -2734,7 +2749,7 @@ if [[ -n "$(which policyd-spf)" ]] ; then
# policyd-spf unix - n n - 0 spawn # policyd-spf unix - n n - 0 spawn
# user=policyd-spf argv=/usr/bin/policyd-spf # user=policyd-spf argv=/usr/bin/policyd-spf
# #
policyd-spf_time_limit = 3600 #policyd-spf_time_limit = 3600
EOF EOF
fi fi
@@ -3034,7 +3049,7 @@ else
EOF EOF
fi fi
if ${IS_SYMPA_LIST_SERVER} ; then if ${IS_SYMPA_LIST_SERVER} || ${IS_RELAY_HOST}; then
cat <<EOF >> /etc/postfix/main.cf cat <<EOF >> /etc/postfix/main.cf
@@ -4132,6 +4147,14 @@ else
dmarc_pipe_present=false dmarc_pipe_present=false
fi 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 _found=false
echononl " Create new file \"${postfix_master_cf}\"" echononl " Create new file \"${postfix_master_cf}\""
if [[ -f "${postfix_master_cf}.$backup_date" ]]; then if [[ -f "${postfix_master_cf}.$backup_date" ]]; then
@@ -4161,9 +4184,11 @@ smtps inet n - y - - smtpd
EOF EOF
fi fi
elif $LISTEN_ON_ADDITIONAL_RELAY_PORT ; then elif $LISTEN_ON_ADDITIONAL_RELAY_PORT ; then
if ! ${additional_relay_port_present} ; then
cat >> $postfix_master_cf << EOF cat >> $postfix_master_cf << EOF
${ADDITIONAL_RELAY_LISTEN_PORT} inet n - y - - smtpd ${ADDITIONAL_RELAY_LISTEN_PORT} inet n - y - - smtpd
EOF EOF
fi
fi fi
continue continue
fi fi