Merge pull request #1770 from casperklein/fix-1769

This commit is contained in:
Georg Lauterbach 2021-01-26 13:13:23 +01:00 committed by GitHub
commit fd030644bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 41 deletions

View File

@ -40,7 +40,7 @@ SPAMASSASSIN_SPAM_TO_INBOX_IS_SET="$( if [[ -n ${SPAMASSASSIN_SPAM_TO_INBOX+'set
SPAMASSASSIN_SPAM_TO_INBOX="${SPAMASSASSIN_SPAM_TO_INBOX:=0}"
SPOOF_PROTECTION="${SPOOF_PROTECTION:=0}"
SRS_SENDER_CLASSES="${SRS_SENDER_CLASSES:=envelope_sender}"
SSL_TYPE="${SSL_TYPE:=''}"
SSL_TYPE="${SSL_TYPE:=}"
SUPERVISOR_LOGLEVEL="${SUPERVISOR_LOGLEVEL:=warn}"
TLS_LEVEL="${TLS_LEVEL:=modern}"
VIRUSMAILS_DELETE_DELAY="${VIRUSMAILS_DELETE_DELAY:=7}"
@ -406,46 +406,46 @@ function _setup_default_vars
LOGWATCH_RECIPIENT="${LOGWATCH_RECIPIENT:=${REPORT_RECIPIENT}}"
{
echo "DOVECOT_MAILBOX_FORMAT=${DOVECOT_MAILBOX_FORMAT}"
echo "DOVECOT_TLS=${DOVECOT_TLS}"
echo "ENABLE_CLAMAV=${ENABLE_CLAMAV}"
echo "ENABLE_FAIL2BAN=${ENABLE_FAIL2BAN}"
echo "ENABLE_FETCHMAIL=${ENABLE_FETCHMAIL}"
echo "ENABLE_LDAP=${ENABLE_LDAP}"
echo "ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE}"
echo "ENABLE_POP3=${ENABLE_POP3}"
echo "ENABLE_POSTGREY=${ENABLE_POSTGREY}"
echo "ENABLE_QUOTAS=${ENABLE_QUOTAS}"
echo "ENABLE_SASLAUTHD=${ENABLE_SASLAUTHD}"
echo "ENABLE_SPAMASSASSIN=${ENABLE_SPAMASSASSIN}"
echo "ENABLE_SRS=${ENABLE_SRS}"
echo "FETCHMAIL_POLL=${FETCHMAIL_POLL}"
echo "FETCHMAIL_PARALLEL=${FETCHMAIL_PARALLEL}"
echo "LDAP_START_TLS=${LDAP_START_TLS}"
echo "LOGROTATE_INTERVAL=${LOGROTATE_INTERVAL}"
echo "LOGWATCH_INTERVAL=${LOGWATCH_INTERVAL}"
echo "MOVE_SPAM_TO_JUNK=${MOVE_SPAM_TO_JUNK}"
echo "NETWORK_INTERFACE=${NETWORK_INTERFACE}"
echo "ONE_DIR=${ONE_DIR}"
echo "OVERRIDE_HOSTNAME=${OVERRIDE_HOSTNAME}"
echo "POSTGREY_AUTO_WHITELIST_CLIENTS=${POSTGREY_AUTO_WHITELIST_CLIENTS}"
echo "POSTGREY_DELAY=${POSTGREY_DELAY}"
echo "POSTGREY_MAX_AGE=${POSTGREY_MAX_AGE}"
echo "POSTGREY_TEXT=${POSTGREY_TEXT}"
echo "POSTFIX_INET_PROTOCOLS=${POSTFIX_INET_PROTOCOLS}"
echo "POSTFIX_MAILBOX_SIZE_LIMIT=${POSTFIX_MAILBOX_SIZE_LIMIT}"
echo "POSTFIX_MESSAGE_SIZE_LIMIT=${POSTFIX_MESSAGE_SIZE_LIMIT}"
echo "POSTSCREEN_ACTION=${POSTSCREEN_ACTION}"
echo "REPORT_RECIPIENT=${REPORT_RECIPIENT}"
echo "SMTP_ONLY=${SMTP_ONLY}"
echo "SPAMASSASSIN_SPAM_TO_INBOX=${SPAMASSASSIN_SPAM_TO_INBOX}"
echo "SPOOF_PROTECTION=${SPOOF_PROTECTION}"
echo "SRS_SENDER_CLASSES=${SRS_SENDER_CLASSES}"
echo "SSL_TYPE=${SSL_TYPE}"
echo "SUPERVISOR_LOGLEVEL=${SUPERVISOR_LOGLEVEL}"
echo "TLS_LEVEL=${TLS_LEVEL}"
echo "VIRUSMAILS_DELETE_DELAY=${VIRUSMAILS_DELETE_DELAY}"
echo "DMS_DEBUG=${DMS_DEBUG}"
echo "export DOVECOT_MAILBOX_FORMAT='${DOVECOT_MAILBOX_FORMAT}'"
echo "export DOVECOT_TLS='${DOVECOT_TLS}'"
echo "export ENABLE_CLAMAV='${ENABLE_CLAMAV}'"
echo "export ENABLE_FAIL2BAN='${ENABLE_FAIL2BAN}'"
echo "export ENABLE_FETCHMAIL='${ENABLE_FETCHMAIL}'"
echo "export ENABLE_LDAP='${ENABLE_LDAP}'"
echo "export ENABLE_MANAGESIEVE='${ENABLE_MANAGESIEVE}'"
echo "export ENABLE_POP3='${ENABLE_POP3}'"
echo "export ENABLE_POSTGREY='${ENABLE_POSTGREY}'"
echo "export ENABLE_QUOTAS='${ENABLE_QUOTAS}'"
echo "export ENABLE_SASLAUTHD='${ENABLE_SASLAUTHD}'"
echo "export ENABLE_SPAMASSASSIN='${ENABLE_SPAMASSASSIN}'"
echo "export ENABLE_SRS='${ENABLE_SRS}'"
echo "export FETCHMAIL_POLL='${FETCHMAIL_POLL}'"
echo "export FETCHMAIL_PARALLEL='${FETCHMAIL_PARALLEL}'"
echo "export LDAP_START_TLS='${LDAP_START_TLS}'"
echo "export LOGROTATE_INTERVAL='${LOGROTATE_INTERVAL}'"
echo "export LOGWATCH_INTERVAL='${LOGWATCH_INTERVAL}'"
echo "export MOVE_SPAM_TO_JUNK='${MOVE_SPAM_TO_JUNK}'"
echo "export NETWORK_INTERFACE='${NETWORK_INTERFACE}'"
echo "export ONE_DIR='${ONE_DIR}'"
echo "export OVERRIDE_HOSTNAME='${OVERRIDE_HOSTNAME}'"
echo "export POSTGREY_AUTO_WHITELIST_CLIENTS='${POSTGREY_AUTO_WHITELIST_CLIENTS}'"
echo "export POSTGREY_DELAY='${POSTGREY_DELAY}'"
echo "export POSTGREY_MAX_AGE='${POSTGREY_MAX_AGE}'"
echo "export POSTGREY_TEXT='${POSTGREY_TEXT}'"
echo "export POSTFIX_INET_PROTOCOLS='${POSTFIX_INET_PROTOCOLS}'"
echo "export POSTFIX_MAILBOX_SIZE_LIMIT='${POSTFIX_MAILBOX_SIZE_LIMIT}'"
echo "export POSTFIX_MESSAGE_SIZE_LIMIT='${POSTFIX_MESSAGE_SIZE_LIMIT}'"
echo "export POSTSCREEN_ACTION='${POSTSCREEN_ACTION}'"
echo "export REPORT_RECIPIENT='${REPORT_RECIPIENT}'"
echo "export SMTP_ONLY='${SMTP_ONLY}'"
echo "export SPAMASSASSIN_SPAM_TO_INBOX='${SPAMASSASSIN_SPAM_TO_INBOX}'"
echo "export SPOOF_PROTECTION='${SPOOF_PROTECTION}'"
echo "export SRS_SENDER_CLASSES='${SRS_SENDER_CLASSES}'"
echo "export SSL_TYPE='${SSL_TYPE}'"
echo "export SUPERVISOR_LOGLEVEL='${SUPERVISOR_LOGLEVEL}'"
echo "export TLS_LEVEL='${TLS_LEVEL}'"
echo "export VIRUSMAILS_DELETE_DELAY='${VIRUSMAILS_DELETE_DELAY}'"
echo "export DMS_DEBUG='${DMS_DEBUG}'"
} >>/root/.bashrc
}