From 30fe6d2e3c5be846fcec42fea3430019ddcf9205 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 20 Aug 2020 10:39:10 +0200
Subject: [PATCH] Final sogo upgrade

---
 consul/configuration/email/sogo/sogo.conf.tpl | 2 +-
 nomad/email.hcl                               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/consul/configuration/email/sogo/sogo.conf.tpl b/consul/configuration/email/sogo/sogo.conf.tpl
index 0b87db7..d4261e5 100644
--- a/consul/configuration/email/sogo/sogo.conf.tpl
+++ b/consul/configuration/email/sogo/sogo.conf.tpl
@@ -23,7 +23,7 @@
   SOGoSentFolderName = Sent;
   SOGoTrashFolderName = Trash;
   SOGoDraftsFolderName = Drafts;
-  SOGoIMAPServer = "imaps://dovecot-imaps.service.2.cluster.deuxfleurs.fr:993/";
+  SOGoIMAPServer = "imaps://dovecot-imaps.service.2.cluster.deuxfleurs.fr:993/?tlsVerifyMode=none";
   SOGoSieveServer = "sieve://sieve.service.2.cluster.deuxfleurs.fr:4190/?tls=YES";
   SOGoIMAPAclConformsToIMAPExt = YES;
   SOGoVacationEnabled = NO;
diff --git a/nomad/email.hcl b/nomad/email.hcl
index 1cb0c23..86c4d87 100644
--- a/nomad/email.hcl
+++ b/nomad/email.hcl
@@ -414,7 +414,7 @@ job "email" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_sogo:v6"
+        image = "superboum/amd64_sogo:v7"
         readonly_rootfs = false
         port_map {
           sogo_web_port = 8080
@@ -423,6 +423,9 @@ job "email" {
 	  "secrets/sogo.conf:/etc/sogo/sogo.conf",
         ]
       }
+      env {
+        FAKE = 2
+      }
 
       /* Workaround as there is no consul source and no way to template recursively... */
       artifact {