From a84f4c8f877be2f8316b49d884d5039d5e5318ed Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 8 Mar 2021 17:32:05 +0100
Subject: Use patched Alps from git.deuxfleurs.fr/Deuxfleurs/alps

---
 app/docker-compose.yml                |  2 +-
 app/email/build/alps/Dockerfile       |  7 ++---
 app/email/build/alps/skipverify.patch | 55 -----------------------------------
 app/email/deploy/email.hcl            | 11 +++++--
 4 files changed, 11 insertions(+), 64 deletions(-)
 delete mode 100644 app/email/build/alps/skipverify.patch

(limited to 'app')

diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index a44e932..760a349 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     build:
       context: ./email/build/alps
       args:
-        VERSION: 5cef0aaff2b8b6ee3e00b566123517e241d8cfb8
+        VERSION: 9bafa64b9d
     image: superboum/amd64_alps:v1
 
   # VoIP
diff --git a/app/email/build/alps/Dockerfile b/app/email/build/alps/Dockerfile
index 647d90d..04599b4 100644
--- a/app/email/build/alps/Dockerfile
+++ b/app/email/build/alps/Dockerfile
@@ -6,14 +6,11 @@ ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
 WORKDIR /tmp/alps
 
 RUN git init && \
-    git remote add origin https://git.sr.ht/~migadu/alps && \
+    git remote add origin https://git.deuxfleurs.fr/Deuxfleurs/alps.git && \
     git fetch --depth 1 origin ${VERSION} && \
     git checkout FETCH_HEAD
 
-COPY skipverify.patch skipverify.patch
-
-RUN git apply skipverify.patch && \
-    go build -a -o /usr/local/bin/alps ./cmd/alps
+RUN go build -a -o /usr/local/bin/alps ./cmd/alps
 
 FROM scratch
 COPY --from=builder /usr/local/bin/alps /alps
diff --git a/app/email/build/alps/skipverify.patch b/app/email/build/alps/skipverify.patch
deleted file mode 100644
index 14e14cb..0000000
--- a/app/email/build/alps/skipverify.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 47765c10f1af2013556f76dc63dfa056167ae5e8 Mon Sep 17 00:00:00 2001
-From: Quentin <quentin@deuxfleurs.fr>
-Date: Fri, 4 Dec 2020 13:19:24 +0100
-Subject: [PATCH] Skip CA verification
-
----
- imap.go | 3 ++-
- smtp.go | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/imap.go b/imap.go
-index 7554331..1a4931d 100644
---- a/imap.go
-+++ b/imap.go
-@@ -3,6 +3,7 @@ package alps
- import (
- 	"fmt"
- 
-+	"crypto/tls"
- 	"github.com/emersion/go-imap"
- 	imapclient "github.com/emersion/go-imap/client"
- 	"github.com/emersion/go-message/charset"
-@@ -16,7 +17,7 @@ func (s *Server) dialIMAP() (*imapclient.Client, error) {
- 	var c *imapclient.Client
- 	var err error
- 	if s.imap.tls {
--		c, err = imapclient.DialTLS(s.imap.host, nil)
-+		c, err = imapclient.DialTLS(s.imap.host, &tls.Config{InsecureSkipVerify: true})
- 		if err != nil {
- 			return nil, fmt.Errorf("failed to connect to IMAPS server: %v", err)
- 		}
-diff --git a/smtp.go b/smtp.go
-index 5e178f2..8d22f1d 100644
---- a/smtp.go
-+++ b/smtp.go
-@@ -3,6 +3,7 @@ package alps
- import (
- 	"fmt"
- 
-+	"crypto/tls"
- 	"github.com/emersion/go-smtp"
- )
- 
-@@ -14,7 +15,7 @@ func (s *Server) dialSMTP() (*smtp.Client, error) {
- 	var c *smtp.Client
- 	var err error
- 	if s.smtp.tls {
--		c, err = smtp.DialTLS(s.smtp.host, nil)
-+		c, err = smtp.DialTLS(s.smtp.host, &tls.Config{InsecureSkipVerify: true})
- 		if err != nil {
- 			return nil, fmt.Errorf("failed to connect to SMTPS server: %v", err)
- 		}
--- 
-2.28.0
-
diff --git a/app/email/deploy/email.hcl b/app/email/deploy/email.hcl
index bef7268..850a88f 100644
--- a/app/email/deploy/email.hcl
+++ b/app/email/deploy/email.hcl
@@ -393,11 +393,16 @@ job "email" {
     task "main" {
       driver = "docker"
       config {
-        image = "superboum/amd64_alps:v1"
+        image = "lxpz/alps_amd64:v2"
         readonly_rootfs = true
         ports = [ "alps_web_port" ]
-        command = "-theme"
-        args = [ "alps", "imaps://imap.deuxfleurs.fr:993", "smtps://smtp.deuxfleurs.fr:465" ]
+        args = [
+			"-skiptlsverification",
+			"-theme",
+			"alps",
+			"imaps://imap.deuxfleurs.fr:993",
+			"smtps://smtp.deuxfleurs.fr:465"
+		]
       }
       
       resources {
-- 
cgit v1.2.3