Fix hestiacp#3599 Disable SMTPUTF8 (hestiacp#3603)

* Create user account in correct folder

* Disable SMTPUTF8 for exim

Author: jaapmarcus

bin/v-add-mail-account

@@ -90,9 +90,9 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 fi
 
 # Create mail account folder (mailbox)
-mkdir $HOMEDIR/$user/mail/$domain/$account
-chown $user:mail $HOMEDIR/$user/mail/$domain/$account
-chmod 700 $HOMEDIR/$user/mail/$domain/$account
+mkdir $HOMEDIR/$user/mail/$domain_idn/$account
+chown $user:mail $HOMEDIR/$user/mail/$domain_idn/$account
+chmod 700 $HOMEDIR/$user/mail/$domain_idn/$account
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-delete-mail-account

@@ -60,7 +60,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 	sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/accounts
 	sed -i "/^$account$/d" $HOMEDIR/$user/conf/mail/$domain/fwd_only
 	sed -i "/^$account@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/limits
-	rm -rf $HOMEDIR/$user/mail/$domain/$account
+	rm -rf $HOMEDIR/$user/mail/$domain_idn/$account
 fi
 
 #----------------------------------------------------------#

install/deb/exim/exim4.conf.4.94.template

@@ -15,6 +15,7 @@ add_environment = <; PATH=/bin:/usr/bin
 keep_environment =
 disable_ipv6 = true
 
+smtputf8_advertise_hosts =
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
 hostlist relay_from_hosts = 127.0.0.1

install/deb/exim/exim4.conf.template

@@ -15,6 +15,7 @@ add_environment = <; PATH=/bin:/usr/bin
 keep_environment =
 disable_ipv6 = true
 
+smtputf8_advertise_hosts =
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
 hostlist relay_from_hosts = 127.0.0.1

install/rpm/exim/exim.conf

@@ -13,6 +13,7 @@ add_environment = <; PATH=/bin:/usr/bin
 keep_environment =
 disable_ipv6 = true
 
+smtputf8_advertise_hosts =
 domainlist local_domains = dsearch;/etc/exim/domains/
 domainlist relay_to_domains = dsearch;/etc/exim/domains/
 hostlist relay_from_hosts = 127.0.0.1

install/upgrade/versions/1.8.0.sh

@@ -29,6 +29,13 @@ if [ "$IMAP_SYSTEM" = "dovecot" ]; then
 	fi
 fi
 
+if [ "$MAIL_SYSTEM" = "exim4" ]; then
+	echo "[ * ] Disable SMTPUTF8 for Exim for now"
+	if grep -qw "^smtputf8_advertise_hosts =" /etc/exim4/exim4.conf.template 2> /dev/null; then
+		sed -i "/^domainlist local_domains = dsearch;\/etc\/exim4\/domains\/i smtputf8_advertise_hosts =" /etc/exim4/exim4.conf.template
+	fi
+fi
+
 # Apply the update for existing users to enable the "Enhanced and Optimized TLS" feature
 echo '[ * ] Enable the "Enhanced and Optimized TLS" feature...'