From 2cbc46c1540eb2230f910975cec7be9e31f4fc64 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Sat, 25 Nov 2023 23:37:58 +0100 Subject: [PATCH] matrix: Move the whole email section into the secret Matrix doesn't deep merge the secrets, so this is necessary --- hosts/nachtigall/apps/matrix/synapse.nix | 13 ------------- secrets/matrix-synapse-secret-config.yaml.age | Bin 2922 -> 3224 bytes 2 files changed, 13 deletions(-) diff --git a/hosts/nachtigall/apps/matrix/synapse.nix b/hosts/nachtigall/apps/matrix/synapse.nix index 1429798..0999038 100644 --- a/hosts/nachtigall/apps/matrix/synapse.nix +++ b/hosts/nachtigall/apps/matrix/synapse.nix @@ -52,19 +52,6 @@ in { default_room_version = "10"; disable_msisdn_registration = true; - email = { - app_name = "Matrix"; - client_base_url = "https://chat.pub.solar"; - enable_notifs = true; - enable_tls = true; - invite_client_location = "https://chat.pub.solar"; - notif_for_new_users = true; - notif_from = "Matrix "; - require_transport_security = true; - smtp_host = "mx2.greenbaum.cloud"; - smtp_port = 465; - }; - enable_media_repo = true; enable_metrics = true; enable_registration = false; diff --git a/secrets/matrix-synapse-secret-config.yaml.age b/secrets/matrix-synapse-secret-config.yaml.age index 81c920879b3601e97cca1b60dd97518967146fa6..3c3afab8d396c91c2186330e724bf87c05fc70e0 100644 GIT binary patch literal 3224 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 Juy4it{{gHyT^;}c literal 2922 zcmZA0=|d9-0)}ymtE+Lri>i2Fx*n`X%p{Y9i~^d>Qq7=l{fE*%hNp09~;~*FTSY=|PI*PHvC=^hOL}r=9@@I{- z*b!BNjw9?K;IIq5Hoho<78zBdAVh`zRv+ci1RNS06-Y#qA`2M^hGh!1)N5;Yo$5QY>(=a%s;;eZ2Tqjp!!t;oZ*d1_c9by`GmS~%=xN(>eb zfQ9%vh;W3Ge2hsEF0WC}X7iazp+d-%>3J%CjKKmG5mbz-Rdqt1{`9&glBbeq>gaRp@ZxqzY@$-I;1kl=vDzTrHmm~vydn) zDT;^mew$7#@o{u2mmU|ATAek4o1L}@W-EeyPA^vhDv5wbrs0_}kCjRxd3m5-YO-3H zP7y*&qOKSzw8(rG)T(DNGzvB7qIfYYQyvev+zErv9E(K-uvyQCBoyf-_;DU)H>UuD zMFyySK!_GfXb~fWZFS1>On^NPi7TBjM94wVBMORHqL@=IWDx`*^W$EhoTd%QDV5D>-PJ!3S<}&0Um!ufDSY!dT z`b1pGV%UjDKV`#|(v>7Kerr4_axGq{|sEk~$a|HxRRG0awx@;q%#OUdk)h%h?bg7Jw|T zRZGGAKX&}bM=fGZ9d*-#6du!arADPF8KL5^(aSTad@9_`7usD2Po*`QrFkMA5@oX8 zG&x7*VN*6#fdyn@xfu%mY(Nu$NG2KqO<^@5 zR^X0g(hEfF4kxHniwR3nNX0{x5{O2z1q!*7i29kBHlq zQ1)qYXpW;7&q5%@ljb_7o~wU^j*WYFMd#Pm(uL%SU1#uj?5AT~ z>8k!ooxXGPPeV(NTYheT_TK(210SDySO|TNcF~?3o&LZc=seT9aaiggcz5|Px2{fA z->UqsI+eNRwULw z{;s+v%Q#SfI{(|>PBva8iPh5w)zr%Gw6?k1Ru5h>qtaK``{Hm*bD;9){o0J8>bAo7 zxB6BZUROq1FyPv@KK3DJpET#HeoSi}F^H-*S6K2dfC{BXv@u|eU8Yn zhQ%wD)EsZH;b3weG1Z@MJab{Jw$`aHpiYwA;t_@Lo=)T87c0t|%6wJ2#zZ~QJ zRWNOSYuVQLkt5d170l3YN?(pq-; zlXX0r|7cUytm5z@q9JWCWts-oUVA5H7eF^oTs^9&9=XiEf3baD#jeKs3%{O^UHj`~ zm57|1lcTynVi_^?RY}3%tHwQ3H)$SzXx@T_8=q$>23iVwRF(s4i$1*7bs(G8y6^KZ ze>}f_+D;SVSlshow0&gSlrdi&81M?p6fH|%wc$;%D06Pzfk+12HOi4J?me)slgj99 za$zk~ybRIBo4u}&R&A@*Z^8Y7vAo9Ijz__Z+JZZ_vW~;u+s7HVcrHx7w75ER$`2}2 zdg+CA(jVLUrb%}B(rIr)t3if8}&)Qy4(|=-7d1G zy0V0$Hf-d6yHl4HdCr)zz2MFLOsv=ts9jH=xRiaPt-(1--WR+my}Z!ANIQ@xDh2zO zGBbenWwR2`diCzJJXW(Dy^(pZZ`JMWEaiG#{snO{uabe1FQ>b{g&%IVwiH~er*u;w*J>)?LTM~VLz+XK0w