From b9f89d0416f326d1a4a902bc332288a41d56b815 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:54:57 +0200
Subject: [PATCH] Update v-make-separated-ip-for-email - fix for deb 10 and 11

---
 bin/v-make-separated-ip-for-email | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bin/v-make-separated-ip-for-email b/bin/v-make-separated-ip-for-email
index 49d31f45b..17a0d0cae 100644
--- a/bin/v-make-separated-ip-for-email
+++ b/bin/v-make-separated-ip-for-email
@@ -139,6 +139,15 @@ if [ "$check_grep" -eq 0 ]; then
     echo "=== patching exim4.conf.template"
     mv /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf.template-backup
     cp /usr/local/vesta/install/debian/12/exim/exim4.conf.template /etc/exim4/exim4.conf.template
+
+    release=$(cat /etc/debian_version | tr "." "\n" | head -n1)
+    if [ "$release" -lt 11 ]; then
+        sed -i "s|smtputf8_advertise_hosts|#smtputf8_advertise_hosts|g" /etc/exim4/exim4.conf.template
+    fi
+    if [ "$release" -lt 12 ]; then
+        sed -i "s|message_linelength_limit|#message_linelength_limit|g" /etc/exim4/exim4.conf.template
+    fi
+
     sed -i "s|FIRSTIP|$HOST_IP|g" /etc/exim4/exim4.conf.template
     sed -i "s|SECONDIP|$MAIL_IP|g" /etc/exim4/exim4.conf.template
     sed -i "s|FIRSTHOST|$HOSTNAME|g" /etc/exim4/exim4.conf.template
@@ -168,9 +177,10 @@ if [ "$check_grep" -eq 0 ]; then
     fi
     systemctl restart exim4
     if [ $? -ne 0 ]; then
+        systemctl status exim4
         cp /etc/exim4/exim4.conf.template-backup /etc/exim4/exim4.conf.template
         systemctl restart exim4
-        echo "=== Patching failed, aborting"
+        echo "=== Patching failed, old exim conf returned, exim4 restarted again."
         exit 1
     fi
     echo "=== Patching successful"