Skip to content

Commit 706e96b

Browse files
committed
Remove hardcoded mail in helo data (cosmetic fix).
1 parent c6d2da3 commit 706e96b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

install/deb/exim/exim4.conf.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ begin transports
324324

325325
remote_smtp:
326326
driver = smtp
327-
helo_data = mail.${sender_address_domain}
327+
helo_data = ${sender_address_domain}
328328
dkim_domain = DKIM_DOMAIN
329329
dkim_selector = mail
330330
dkim_private_key = DKIM_PRIVATE_KEY

install/upgrade/versions/latest.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,11 @@ fi
5454
# Remove errornous history.log file created by certain builds due to bug in v-restart-system
5555
if [ -e $HESTIA/data/users/history.log ]; then
5656
rm -f $HESTIA/data/users/history.log
57+
fi
58+
59+
# Use exim4 hostname without hardcoded mailprefix
60+
if [ ! -z "$MAIL_SYSTEM" ]; then
61+
if cat /etc/exim4/exim4.conf.template | grep -q 'helo_data = mail.${sender_address_domain}'; then
62+
sed -i 's/helo_data = mail.${sender_address_domain}/helo_data = ${sender_address_domain}/g' /etc/exim4/exim4.conf.template
63+
fi
5764
fi

0 commit comments

Comments
 (0)