From 2afbc2cddfbbc57f296640cb28d89fb29b2526c2 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sun, 4 Jun 2023 16:41:08 +0200
Subject: [PATCH] Patching exim4.conf for: smtputf8_advertise_hosts

---
 install/debian/10/exim/exim4.conf.template |  1 +
 install/debian/11/exim/exim4.conf.template |  1 +
 install/debian/9/exim/exim4.conf.template  |  1 +
 src/deb/vesta/postinst                     | 20 ++++++++++++++++++++
 4 files changed, 23 insertions(+)

diff --git a/install/debian/10/exim/exim4.conf.template b/install/debian/10/exim/exim4.conf.template
index 0e5afaac..8fa12c2d 100644
--- a/install/debian/10/exim/exim4.conf.template
+++ b/install/debian/10/exim/exim4.conf.template
@@ -11,6 +11,7 @@
 disable_ipv6=true
 add_environment=<; PATH=/bin:/usr/bin
 keep_environment=
+smtputf8_advertise_hosts =
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
diff --git a/install/debian/11/exim/exim4.conf.template b/install/debian/11/exim/exim4.conf.template
index 72e3f668..cbc2e75f 100644
--- a/install/debian/11/exim/exim4.conf.template
+++ b/install/debian/11/exim/exim4.conf.template
@@ -11,6 +11,7 @@
 disable_ipv6=true
 add_environment=<; PATH=/bin:/usr/bin
 keep_environment=
+smtputf8_advertise_hosts =
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
diff --git a/install/debian/9/exim/exim4.conf.template b/install/debian/9/exim/exim4.conf.template
index 261947d2..c9344903 100644
--- a/install/debian/9/exim/exim4.conf.template
+++ b/install/debian/9/exim/exim4.conf.template
@@ -11,6 +11,7 @@
 disable_ipv6=true
 add_environment=<; PATH=/bin:/usr/bin
 keep_environment=
+smtputf8_advertise_hosts =
 
 domainlist local_domains = dsearch;/etc/exim4/domains/
 domainlist relay_to_domains = dsearch;/etc/exim4/domains/
diff --git a/src/deb/vesta/postinst b/src/deb/vesta/postinst
index 975d12cd..97df816e 100755
--- a/src/deb/vesta/postinst
+++ b/src/deb/vesta/postinst
@@ -25,6 +25,26 @@ fi
 echo "1" > /usr/local/vesta/data/upgrades/show_changelog
 chmod a=rw /usr/local/vesta/data/upgrades/show_changelog
 
+# Patching exim4.conf for: smtputf8_advertise_hosts
+if [ "$release" -gt 8 ]; then
+    if [ -f "/etc/exim4/exim4.conf.template" ]; then
+        if ! grep -q 'smtputf8_advertise_hosts' /etc/exim4/exim4.conf.template; then
+            echo 'Patching exim4.conf for: smtputf8_advertise_hosts'
+            sed -i  "/^domainlist local_domains = dsearch;\/etc\/exim4\/domains\//i smtputf8_advertise_hosts =" /etc/exim4/exim4.conf.template
+            systemctl restart exim4
+        fi
+    fi
+fi
+
+# Patching exim4.conf for: Helo name contains a ip address
+if [ -f "/etc/exim4/exim4.conf.template" ]; then
+    if grep -q 'drop    message       = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid' /etc/exim4/exim4.conf.template; then
+        echo 'Patching exim4.conf for: Helo name contains a ip address'
+        patch /etc/exim4/exim4.conf.template < /usr/local/vesta/src/deb/for-download/tools/patches/exim_helo_authenticated.patch
+        sed -i '/telenor\.rs/d' /etc/exim4/exim4.conf.template
+        systemctl restart exim4
+    fi
+fi
 
 # Making sure yescrypt is disabled
 if [ "$release" -eq 11 ]; then