Merge pull request hestiacp#4389 from clarkhost/fix/smtp-relay-routing-issue

Fix SMTP Relay routing issue

Author: jaapmarcus

bin/v-add-mail-domain-smtp-relay

@@ -54,6 +54,7 @@ port:$port
 user:$username
 pass:$password
 EOL
+rm $HOMEDIR/$user/conf/mail/$domain/ip
 
 #----------------------------------------------------------#
 #                       Hestia                             #

func/rebuild.sh

@@ -635,7 +635,7 @@ rebuild_mail_domain_conf() {
 		touch $HOMEDIR/$user/conf/mail/$domain/limits
 
 		# Setting outgoing ip address
-		if [ -n "$local_ip" ]; then
+		if [ -n "$local_ip" ] && [ "$U_SMTP_RELAY" != 'true' ]; then
 			echo "$local_ip" > $HOMEDIR/$user/conf/mail/$domain/ip
 		fi