From c3c98348e2cf22cff70952e6ba95b91abbcf66b6 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 24 Sep 2020 21:51:32 +0200
Subject: [PATCH] [SOGo] Re-enable TLS for internal IMAP connections, enable
 TLS for internal SMTP connections [Web] Minor fix in quarantine view

---
 data/Dockerfiles/sogo/bootstrap-sogo.sh | 2 +-
 data/conf/sogo/sogo.conf                | 4 ++--
 data/web/admin.php                      | 2 +-
 docker-compose.yml                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/Dockerfiles/sogo/bootstrap-sogo.sh b/data/Dockerfiles/sogo/bootstrap-sogo.sh
index e7772d1e..2c0d2629 100755
--- a/data/Dockerfiles/sogo/bootstrap-sogo.sh
+++ b/data/Dockerfiles/sogo/bootstrap-sogo.sh
@@ -145,7 +145,7 @@ cat <<EOF > /var/lib/sogo/GNUstep/Defaults/sogod.plist
     <key>OCSAclURL</key>
     <string>mysql://${DBUSER}:${DBPASS}@%2Fvar%2Frun%2Fmysqld%2Fmysqld.sock/${DBNAME}/sogo_acl</string>
     <key>SOGoIMAPServer</key>
-    <string>imap://${IPV4_NETWORK}.250:143/?TLS=NO</string>
+    <string>imap://${IPV4_NETWORK}.250:143/?TLS=YES&amp;tlsVerifyMode=none</string>
     <key>SOGoTrustProxyAuthentication</key>
     <string>${TRUST_PROXY}</string>
     <key>SOGoEncryptionKey</key>
diff --git a/data/conf/sogo/sogo.conf b/data/conf/sogo/sogo.conf
index 9d04f0b5..78791d58 100644
--- a/data/conf/sogo/sogo.conf
+++ b/data/conf/sogo/sogo.conf
@@ -27,8 +27,8 @@
     // );
 
     // self-signed is not trusted anymore
-    SOGoSieveServer = "sieve://dovecot:4190/?tls=NO";
-    SOGoSMTPServer = "postfix:588";
+    SOGoSieveServer = "sieve://dovecot:4190/?TLS=YES&tlsVerifyMode=none";
+    SOGoSMTPServer = "smtp://postfix:588/?TLS=YES&tlsVerifyMode=none";
     WOPort = "0.0.0.0:20000";
     SOGoMemcachedHost = "memcached";
 
diff --git a/data/web/admin.php b/data/web/admin.php
index 3e681dc6..b62db9e7 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -854,7 +854,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
             </div>
           </div>
           <div class="form-group">
-            <label class="col-sm-4 control-label" for="exclude_domains"><?=$lang['admin']['quarantine_exclude_domains'];?>:</label><br />
+            <label class="col-sm-4 control-label" for="exclude_domains"><?=$lang['admin']['quarantine_exclude_domains'];?>:</label>
             <div class="col-sm-8">
               <select data-width="100%" name="exclude_domains" class="selectpicker" title="<?=$lang['tfa']['select'];?>" multiple>
               <?php
diff --git a/docker-compose.yml b/docker-compose.yml
index eed2a2dd..5e72fa65 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -159,7 +159,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.85
+      image: mailcow/sogo:1.86
       environment:
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}