From 6c17c2d82c25a0958b907c3ccbc08ffb974d3ce7 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Wed, 9 Jun 2021 14:57:51 +0200
Subject: [PATCH] services: matrix: move smtp port note out of secret

---
 secrets/matrix-email-config.nix | Bin 402 -> 262 bytes
 services/matrix.nix             |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/secrets/matrix-email-config.nix b/secrets/matrix-email-config.nix
index ef7eed831c4232b875be77e00bf40096c41808e9..dcdbb060f8b55cdc9710c1825db9050dd34be5e5 100644
GIT binary patch
literal 262
zcmV+h0r~y_M@dveQdv+`0AixK;bsfgWEj`H;#9)adT0(^GpR-2b+&$JWde*JmWjrt
zx(m5@z63T+EpBKOxXjIY1Os>?%hl-@He$kl9~#~tDdgqf^fvea%eMWLfXzYs*GGOg
zGC7SFe9+$Ke@b?0*Pkwo)W1{dTl%a+KE;_|=q@kn7g{z*)L+c#O@<@TJ|{%fq?kJL
z0p3NLP;Hec-tuDFX5yv)#YY&sTW)S9_+=;hDpb4VV9H#*rp3OwaE``KS+Nso%l`AY
zdbm4jXcD(pVr$yxWg;Q0x91i9&2h_m%)#gOqP+i3k?8CBd<cH3X`$-y2A`+iF9_am
M=1J=q0<%&P>32VfK>z>%

literal 402
zcmV;D0d4*OM@dveQdv+`0E-F|k#-K9`wE!71CtsJ2lGY4)WD-q-MO}Pha$a$NyL2r
zFnxe+m+v3ogj2zL>ouPhG>CqdIFTS#bHkl{D};+Pna0S~?YvD}Mq0n;Ve<-w%ikvE
zu$Iplk{n0RhP8K(jmXwnRW%oG|J4Nhw;{on3AklAH6nZdF6-;SR!)d<q*v`nx}#8~
zcKmFhgtoLJYfp3MHk@rSCMA*luqfAc{{4|b3ymWkl$sN=K2JzMLKxm@<1{DWc%A+&
z#?45#dDuuJKOWcJwpQWphdwYOlp;{Yuod!hVq$9S0YoZ;*^Paz&3B+-s0S7pG|+e=
zy)pt*G1l9tSeRG>x0BkSJ?84(kDQX*xe=;+Uf*8Pw-bg%(u;!JokrUP$a>S=u->N7
zMBYa?@$nHWhhGrx5=nF0#_AeYsXfp~TBXsx*gpK+<uELo5M~Yon3Y*?P#zO?Xcu~?
wtsFB+050GH?r5ASSX~tf+9g*8f1toEH<w+NIjO*(QoIk6SQ>t_;^6Go;g)#B#sB~S

diff --git a/services/matrix.nix b/services/matrix.nix
index 228cabf..7a7b223 100644
--- a/services/matrix.nix
+++ b/services/matrix.nix
@@ -39,6 +39,12 @@ in {
           smtpPort = mkOption {
             type = types.port;
             default = 587;
+            description = ''
+              The port to use to connect to the SMTP host.
+
+              Defaulting to STARTTLS port 587 because TLS port 465 isn't supported by synapse
+              See https://github.com/matrix-org/synapse/issues/8046
+            '';
           };
           smtpUser = mkOption {
             type = types.str;