smtputf8_advertise_hosts is not supported by deb10 (hestiacp#3652)

Author: jaapmarcus

install/hst-install-debian.sh

@@ -1758,6 +1758,10 @@ if [ "$exim" = 'yes' ]; then
 		sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
 	fi
 
+	if [ "$release" = 10 ]; then
+		sed -i "/^smtputf8_advertise_hosts =/d" /etc/exim4/exim4.conf.template
+	fi
+
 	chmod 640 /etc/exim4/exim4.conf.template
 	rm -rf /etc/exim4/domains
 	mkdir -p /etc/exim4/domains

install/upgrade/versions/1.8.0.sh

@@ -23,6 +23,8 @@ upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'true'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
+os_release="$(lsb_release -s -i | tr "[:upper:]" "[:lower:]")-$(lsb_release -s -r)"
+
 if [ "$IMAP_SYSTEM" = "dovecot" ]; then
 	if ! grep -qw "^extra_groups = mail$" /etc/dovecot/conf.d/10-master.conf 2> /dev/null; then
 		sed -i "s/^service auth {/service auth {\n  extra_groups = mail\n/g" /etc/dovecot/conf.d/10-master.conf
@@ -43,17 +45,20 @@ if [ -f /etc/fail2ban/jail.local ]; then
 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
+	if [ "$os_release" != "debian-10" ]; then
+		# Exclude Debian 10...
+		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
 fi
 
 # Apply the update for existing users to enable the "Enhanced and Optimized TLS" feature
 echo '[ * ] Enable the "Enhanced and Optimized TLS" feature...'
 
 # Configuring global OpenSSL options
-os_release="$(lsb_release -s -i | tr "[:upper:]" "[:lower:]")-$(lsb_release -s -r)"
+
 tls13_ciphers="TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384"
 
 if ! grep -qw "^[hestia_openssl_sect]$" /etc/ssl/openssl.cnf 2> /dev/null; then