Skip to content

Commit c9a49bb

Browse files
committed
Re-worded SMTP Relay upgrade failure message.
1 parent f1b6265 commit c9a49bb

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

install/upgrade/versions/1.4.0.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ if [ "$MAIL_SYSTEM" == "exim4" ]; then
5858
echo '[ * ] Enabling SMTP relay support...'
5959
if grep -q "driver = plaintext" /etc/exim4/exim4.conf.template; then
6060
disable_smtp_relay=true
61-
echo '[ ! ] ERROR: Manual intervention required to enable SMTP Relay:'
61+
echo '[ ! ] ERROR: SMTP Relay upgrade failed:'
6262
echo ''
63-
echo ' Exim only supports one plaintext authenticator.'
64-
echo ' If you want to use the Hestia smtp relay feature,'
65-
echo ' please review the /etc/exim4/exim4.conf.template'
66-
echo ' file and resolve any conflicts.'
67-
$HESTIA/bin/v-add-user-notification admin 'Manual intervention required to enable SMTP Relay' 'ERROR: Manual intervention required to enable SMTP Relay: <br />Exim only supports one plaintext authenticator. If you want to use the Hestia smtp relay feature, please review the /etc/exim4/exim4.conf.template file and resolve any conflicts.'
63+
echo 'Because of the complexity of the SMTP Relay upgrade,'
64+
echo 'we were unable to safely modify your existing exim config file.'
65+
echo 'If you would like to use the new SMTP Relay features,'
66+
echo 'you will have to replace or modify your config with the one found'
67+
echo 'on GitHub at https://github.com/hestiacp/hestiacp/blob/release/install/deb/exim/exim4.conf.template.'
68+
echo 'Your exim config file will be found here: /etc/exim4/exim4.conf.template'
69+
$HESTIA/bin/v-add-user-notification admin 'SMTP Relay upgrade failed' 'Because of the complexity of the SMTP Relay upgrade, we were unable to safely modify your existing exim config file.<br><br>If you would like to use the new SMTP Relay features, you will have to replace or modify your config with the one found on <a href="https://github.com/hestiacp/hestiacp/blob/release/install/deb/exim/exim4.conf.template" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br>Your exim config file will be found here:<br><br><code>/etc/exim4/exim4.conf.template</code>'
6870
else
6971
disable_smtp_relay=false
7072
fi

0 commit comments

Comments
 (0)