From 1d1a6b4459660aa28ecfcad4cdbbd4bb8bd6886e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 27 Nov 2017 22:41:46 +0000
Subject: [PATCH] Disable exim chunking

---
 src/freedombone-app-smilodon | 22 ++++++++++++----------
 src/freedombone-base-email   |  3 +++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/freedombone-app-smilodon b/src/freedombone-app-smilodon
index b0f9bc5e..6dae0870 100755
--- a/src/freedombone-app-smilodon
+++ b/src/freedombone-app-smilodon
@@ -108,17 +108,19 @@ function upgrade_smilodon {
 }
 
 function backup_local_smilodon {
-    if [ -d $SMILODON_PATH ]; then
-        systemctl stop smilodon
-
-        USE_MONGODB=1
-        function_check backup_database_to_usb
-        backup_database_to_usb smilodon
-
-        backup_directory_to_usb $SMILODON_PATH smilodon
-
-        systemctl start smilodon
+    if [ ! -d $SMILODON_PATH ]; then
+        return
     fi
+
+    systemctl stop smilodon
+
+    USE_MONGODB=1
+    function_check backup_database_to_usb
+    backup_database_to_usb smilodon
+
+    backup_directory_to_usb $SMILODON_PATH smilodon
+
+    systemctl start smilodon
 }
 
 function restore_local_smilodon {
diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 5bdea62a..055482d1 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -846,6 +846,9 @@ function install_email_basic {
     echo "dc_mailname_in_oh='true'" >> /etc/exim4/update-exim4.conf.conf
     echo "dc_localdelivery='maildir_home'" >> /etc/exim4/update-exim4.conf.conf
     echo "dc_main_log_selector=-all" >> /etc/exim4/update-exim4.conf.conf
+
+    echo "chunking_advertise_hosts =" > /etc/exim4/conf.d/main/04_exim4-config_chunking
+
     update-exim4.conf
     sed -i "s/START=no/START=yes/g" /etc/default/saslauthd
     systemctl start saslauthd