Merge pull request #1272 from erik-wramner/fix_1271_wrong_address

Fix report_recipient bugs
This commit is contained in:
Erik Wramner 2019-09-22 18:42:11 +02:00 committed by GitHub
commit fe3f747c72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -451,14 +451,14 @@ function _setup_default_vars() {
# set PFLOGSUMM_TRIGGER here for backwards compatibility # set PFLOGSUMM_TRIGGER here for backwards compatibility
# when REPORT_RECIPIENT is on the old method should be used # when REPORT_RECIPIENT is on the old method should be used
if [ $"REPORT_RECIPIENT" != "0" ]; then if [ "$REPORT_RECIPIENT" != "0" ]; then
DEFAULT_VARS["PFLOGSUMM_TRIGGER"]="${PFLOGSUMM_TRIGGER:="logrotate"}" DEFAULT_VARS["PFLOGSUMM_TRIGGER"]="${PFLOGSUMM_TRIGGER:="logrotate"}"
else else
DEFAULT_VARS["PFLOGSUMM_TRIGGER"]="${PFLOGSUMM_TRIGGER:="none"}" DEFAULT_VARS["PFLOGSUMM_TRIGGER"]="${PFLOGSUMM_TRIGGER:="none"}"
fi fi
# Expand address to simplify the rest of the script # Expand address to simplify the rest of the script
if [ $"REPORT_RECIPIENT" == "1" ]; then if [ "$REPORT_RECIPIENT" == "1" ]; then
REPORT_RECIPIENT="$POSTMASTER_ADDRESS" REPORT_RECIPIENT="$POSTMASTER_ADDRESS"
DEFAULT_VARS["REPORT_RECIPIENT"]="${REPORT_RECIPIENT}" DEFAULT_VARS["REPORT_RECIPIENT"]="${REPORT_RECIPIENT}"
fi fi