From 36ce53c03c307692ba07ef951b2ddb84755f7b50 Mon Sep 17 00:00:00 2001
From: Paul Cammish <kelduum@mythic-beasts.com>
Date: Mon, 8 Jul 2019 23:14:01 +0100
Subject: [PATCH 1/3] Update mail/sbin/sympl-mail-dovecot-sni,
 mail/debian/changelog files

---
 mail/debian/changelog            | 6 ++++++
 mail/sbin/sympl-mail-dovecot-sni | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mail/debian/changelog b/mail/debian/changelog
index bc3b630f..64115468 100644
--- a/mail/debian/changelog
+++ b/mail/debian/changelog
@@ -1,3 +1,9 @@
+sympl-mail (10.0.190708.0) stable; urgency=medium
+
+  * Re-enable Dovecot SNI
+
+ -- Paul Cammish <sympl@kelduum.net>  Mon, 08 Jul 2019 22:13:14 +0100
+
 sympl-mail (10.0.190707.0) stable; urgency=medium
 
   * Fixed unhandled input
diff --git a/mail/sbin/sympl-mail-dovecot-sni b/mail/sbin/sympl-mail-dovecot-sni
index ff8de6bb..21ed2b74 100755
--- a/mail/sbin/sympl-mail-dovecot-sni
+++ b/mail/sbin/sympl-mail-dovecot-sni
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ ! -L '/srv/*/config/ssl/current' ]; then
+if [ "$( find -L /srv -mindepth 5 -maxdepth 5 -name 'ssl.crt' -path '*/config/ssl/current/*' -print | wc -l )" == "0" ]; then
   # No certs avaialable, so check if /etc/dovecot/sympl.d/10-main/60-sni exists
   if [ -f /etc/dovecot/sympl.d/10-main/60-sni ]; then
     # it exists, so remove it
@@ -21,7 +21,7 @@ if [ ! -L '/srv/*/config/ssl/current' ]; then
   fi
 fi
 
-for certificate in $( find -L '/srv/*/config/ssl/current' -name 'ssl.crt' -print ); do
+for certificate in $( find -L /srv -mindepth 5 -maxdepth 5 -name 'ssl.crt' -path '*/config/ssl/current/*' -print ); do
   certpath="$( echo $certificate | sed 's|/config/ssl/current/.*$|/config/ssl/current|' )"
   # Ensure there is a matching key file, and the path doesnt include an underscore
   if [ -f "${certpath}/ssl.key" ] && [ -f "${certpath}/ssl.bundle" ] && [ "$certpath" != "*_*" ] ; then
-- 
GitLab


From b001e5dce5be9501f594a4cb4be0071750939dbf Mon Sep 17 00:00:00 2001
From: Paul Cammish <kelduum@mythic-beasts.com>
Date: Tue, 9 Jul 2019 10:37:05 +0100
Subject: [PATCH 2/3] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e15b870..cd9910ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ stages:
     - git describe --all
     - echo "Building '$CI_BUILD_NAME' in directory '$PACKAGE'"
     - cd $PACKAGE
+    - dpkg-parsechangelog
     - dpkg-buildpackage --no-sign --build=full
     - cd ..
     - mkdir deb
-- 
GitLab


From c23006f0be7a5d7b0164e4ec23ec75cebc7c732e Mon Sep 17 00:00:00 2001
From: Paul Cammish <kelduum@mythic-beasts.com>
Date: Tue, 9 Jul 2019 11:17:56 +0100
Subject: [PATCH 3/3] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd9910ca..391ee9ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,9 @@ stages:
     - git describe --all
     - echo "Building '$CI_BUILD_NAME' in directory '$PACKAGE'"
     - cd $PACKAGE
-    - dpkg-parsechangelog
+    - dpkg-parsechangelog 2> /tmp/error
+    - cat /tmp/error
+    - if [ -s /tmp/error ]; then exit 1; fi
     - dpkg-buildpackage --no-sign --build=full
     - cd ..
     - mkdir deb
-- 
GitLab