diff options
author | Quentin Dufour <quentin@deuxfleurs.fr> | 2021-01-18 16:46:21 +0100 |
---|---|---|
committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2021-01-18 16:46:21 +0100 |
commit | 2c2efdc27684c1382a4949cff8fe06ee36c0f4c0 (patch) | |
tree | c01dd9454deeec6f43ce5ccd94d12138e6f9ea18 /app/build/alps | |
parent | 6c8c861dd50aebf4a12232ecc1fab12c5f83bf03 (diff) | |
parent | ad6017eea058f7cb6fdf078783f992a4f45a3e15 (diff) | |
download | infrastructure-2c2efdc27684c1382a4949cff8fe06ee36c0f4c0.tar.gz infrastructure-2c2efdc27684c1382a4949cff8fe06ee36c0f4c0.zip |
Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/infrastructure
Diffstat (limited to 'app/build/alps')
-rw-r--r-- | app/build/alps/Dockerfile | 21 | ||||
-rw-r--r-- | app/build/alps/skipverify.patch | 55 |
2 files changed, 0 insertions, 76 deletions
diff --git a/app/build/alps/Dockerfile b/app/build/alps/Dockerfile deleted file mode 100644 index 647d90d..0000000 --- a/app/build/alps/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM golang:1.15.6-buster as builder - -ARG VERSION - -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 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 - -FROM scratch -COPY --from=builder /usr/local/bin/alps /alps -COPY --from=builder /tmp/alps/themes /themes -ENTRYPOINT ["/alps"] diff --git a/app/build/alps/skipverify.patch b/app/build/alps/skipverify.patch deleted file mode 100644 index 14e14cb..0000000 --- a/app/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 - |