From 220ce9c5c35b528c5f88cb0d94294754b3049101 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Thu, 29 Dec 2022 12:12:26 +0100
Subject: [PATCH] services: matrix mautrix-telegram restructure secrets

---
 modules/services/server/matrix.nix           |  10 ++--------
 secrets/services/matrix/mautrix-telegram.age | Bin 1427 -> 1565 bytes
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index 6a3cf2a..8e289ce 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -126,7 +126,7 @@ in {
   services = {
       mautrix-telegram = {
           enable = true;
-          environmentFile = config.age.secrets."services/matrix/mautrix-telegram.env".path
+          environmentFile = config.age.secrets."services/matrix/mautrix-telegram.env".path;
           settings = {
               homeserver = {
                   address = "http://localhost:8008";
@@ -134,7 +134,6 @@ in {
               };
               appservice = {
                   hostname = "127.0.0.1";
-                  database = "postgres://${mautrixteledb}";
                   provisioning.enabled = false;
                   id = "telegram";
                   public = {
@@ -146,7 +145,7 @@ in {
                   startup_sync = true;
                   public_portals = true;
                   double_puppet_server_map = {
-                    "kabtop.de: https://kabtop.de";
+                    "kabtop.de" = "https://kabtop.de";
                   };
                   encryption = {
                       allow = true;
@@ -164,11 +163,6 @@ in {
                       "@kabbone:kabtop.de" = "admin";
                   };
               };
-              telegram = {
-                  api_id = ${telegram-api_id};
-                  api_hash = ${telegram-api_hash};
-                  bot_token = ${telegram-bot_token};
-              };
           };
       };
   };
diff --git a/secrets/services/matrix/mautrix-telegram.age b/secrets/services/matrix/mautrix-telegram.age
index 4bb8216d1898c25c73944e86ff5aed7833467fbb..352b743692b7177c72083af5f23c71c50b9a6ac9 100644
GIT binary patch
literal 1565
zcmY+?{qNia0mt#ggoq_DBuWB|cs@kT_jc=Dua6p$-nDnVUZ1Yl_S)Or?6tjKuf4X{
zUa#L4iQ;B-Jeh2=0h<$sIt;MzlngP5WI|#TGn|nL!34()3Q8m<2tGvk!5{n!Uhm}d
zF<qzTgjQ0-D=!MSM~Mrr8$j*aN}A4UjtwD5gQ$cKy=e_9>mr`m#$b+kYgX?IL=|4*
zT6;CyESf^>wjmiYjrB^RG!F)_NGK=0AxQYMH9K9jvWB>JsBYFG#eNpfGboL)j;OH|
zIryKJq-I51&Aagc=%Yy;;`Htuwq*_u%c(O^#AaXx?GQ6ov1bfNOO^N7rYzw_tY>|_
zB$vEmNmdf_`ZNU^GgZx%aZKl+juHzlnH8OBcShUYr7hrM!}I1IVp?s#SEYqc5;z_r
ziSTHddigk7qyf;HO08xV)O(F~8(Fz|A&C}E`^my%vNW78_$je!X;?T+LEJ%EK59sD
zULXT!>U#>Nm_Q?g6c4g|Nbl%Y)T%ECWulUWZx2y8QF*X888ei$8d12v$OU$_Y$lVi
zKACIHbtK3J0~k`YnhmUR-Vh+pANoB8)2N9iBS@zqF3D9NTr5Y@TIu%$N}if2Q<tNl
zHJr>qB`B-D1w>&Fog;21mnS|da6zGFbGE7YQM;P9TKN*9K$K=AXOm!&G?eJbCOdBG
zjO(~(_ET~N3}y*2Z9<$dp>i%=kE`oE&I+AQ-LN~>stb*Zntd0Gmh(|DM5h!XSX5la
zNuKp{d?m3!8G>rhHV|{tFx)x03??Ay6I_=X#$+=BM`$0`7n(XM)&jd+@>tnib?aoK
z9GG-LOnDs;h#4o%Hr;NwuCCaUU>RHI7<SBMNhv~D;aM=xz>o*Znu9HbkoT5M;a7{C
zSBD;vZvq(x+il05+GJW?<Pg+G=MB1#1)!Rh3RY!fH}B{5iP7bHXp>`1RxC#_-VMSP
zC5f`>0Y)$e?V#7esP~F;Vzbj<>I<Z;^g?k~1~`X}VmM~Fh;72}|2X#6wHQLsikrw7
zl2^zQGZ{&isv1n=)MD7~8iFyHrJYQak!Cirm4%C^XgN$E7U+n)75A8wBk-yybw(v;
zf~cm0_8MN+nOyWug(;$mhN`{)v*dxB4F(l5kN8HLhICyFTL$Zr!<1;%DOuntS*=TB
zbGTx&NzY;MWf$N_qtZ)MvY}8C1u}8sS*d^sY_C8m5$zk=6sD#f(9tFOeQTRny{;6m
zskw<`rcTAwuEB%8TY;|SqslfHXLmCeFn8KwsE)%CRxh*>Zn-K=YO^NOSSzyQ6Cg8d
zH_5`*g?Nss66THRPA@<`wDb)mWkejPyE@Gq@#fH-V?eD|t8nJpM%0o;A#_0c60|uF
z5G^oA$tLvPBtvRk_8_;~A9cGt@cfa_omMVAdTIh`$G-W815bxW<6qoIK6}f5Hm-Q*
zs;4jAi@fo%SA_8&{{fvvlpCMidCOlkfOvS%Z=U$*=^gN)>+1H8UO)crcjWVj@4o2O
z`yberl!tcQb+Y=}N$kmU#@?HrKX`Q8?SJ0Y{n}$!vQPZ`Ec}BXK0+T^zI@s4JMTT|
z-gR{Q#izmK*%MpN@BI1J2M<2F<LUz!-~1M^_1AZ>Z@l%B7f$`|)?Z%o+_U?B`kh@j
zy?f%=w_ez@|9kcg{hdc%{?hipU+~?RYTYl~`|926edLx0rOTcvq2KQQ%mvq<a_>BR
zTlN}q_WEyJc>mV=#^O^S{?ofrZS=rZ==X0w&VBLod*>eq&c*T$dt-j)%)ZB;dh^x~
zy?y+X*gao9`QitDaru4L;r;y9D<7Hu*!ar9JGMN!=hGkDc>K+)KXJn|L-_TFe*fHw
uzy56FZ|K*tL-;E<PM-SJfy=Y|cD?krwEx({!ud1*w7;62yXfW@f&T*k$vPhZ

literal 1427
zcmY+C%kSHS0f5&DvCZRg*a5m-veJTR^sD2<&k8Y|*iQUN{D|Y&M$>9Lw&Q0U$FXAr
zRVOA*MdBs4F%BTLaNtrZRnyR*2M`BXC(xvgZS96Mw3k+C>R`ZucRB39Kk$9hr_b`;
zJvVjoIxB)zdSsRRU<m<xceXa0<(|9fA_zpZQkUL2a%%-+W2G(e9jv1>w3V73pL29h
znrOCFFvZ7;X-M}PP6=QDL>ki>CbGK5+cSY;$OYTXHNot#B^(GTJqn;Xm;@l2NB_6w
z8>^)i;V_edpqNv2xg=F0Tvq&iHxmcen$;8Af$1G=`hrMeDzEp)Juk-vWaM^3ZI&rI
zh!&1PI}D)F42*a9x#^G!zGmFOu9wy(F#O4!NvbhH$yk?6!__LxqP#ZLtsv>a5V44Q
ztcx3y1h$+4jpbR*iji6Mrvsu&?MTu3qK7$>EYvlcy7F+s$|eXIn(OMDE#@_=K2IT3
zQRf1nmD8nTOLXZsL@Z0>#P?QFq72Yd0n-R`M2FzlkXn%xldV(OkW7<X);3wjOzGrP
z3h=N7hDK#%wM|eIqbfqp23g=arIJPw(UV}~2a_P54B0+6(?+wnqDq#d*iJj~Wxh)T
z8*iSGgP~Zds98t$C~-yvSaKN~1kiMs3_1kHr@eSZ=Xl!|{n(6sYB!V}B&98M)5d_A
zMsaRW?<?B?SHjND;a7`(N7xwH!jPvkov$U4*+Ow9$(n`^C+d1LC?njUDk9p1kpu_}
ztA~JIJ1N*9WcBs_Hs!W<cLavzFyX>}HUNvRWcRkyl}6N3)MI%hXlE!m^d_ULivV+!
zhPay5qVXykO*D2Q6=L7n^<)$dXPpgJ8{~{4agAX!+*wRGH;g%A2Q9qVpYz6S2`u!u
zVP%c#<KmdKwI(5!b_&K_sI!R^0*=PQG(zBEig(C*xbRk#JhBNM78?SQFwG4BSZgnQ
zaj2?FK$kt!a}7u#BCi*k6&U+E&lk(4-Zn&KlV5zC1?67WMbMU?D;QF>$gAAQ(FM;#
zqY&pp9~3d!O$=K|M8k|{UDb|=1eAQwM1b5B^prt|V>*mW4-(D5mZmTU+nqs)U@#rH
zYE%!CUfbw=$)(8tR+d|2s?d=zi96GYK_;YDuD02Ff>$BKi1@%)WK-Sx;~lh-BoG)~
zjnx<0V>GPwMJicUd)IKCfUkEEltXMbU#h%_g#{&4U$~m%k#S_Z=jX1qaa&|7Da&!|
z*nPJG3MfX@0=C^eTlE^8nNN$rELN0JG)><^RfHSw(yM9q_F5Ltul4pWsZxt9$HcTZ
zp_*c#ELhbL)TSKkV@vUyJPtt?c;#0o-ns!;K6VPX559QU4<5Pp8#n)t{EY;C<%WmO
z-v7H7)Bk>W`KupX=AJ)z9(m{M*KseMdUB~fdiQ}d=iay|ocZwE`<ug;o{fHL#pizX
z`pXZ$eDc-9&mDWyym3DtKlRVQ-hcM_Cy)N|=BL<CyT{>+Z~g3}{io)q5B}}XKfZYW
zlYNh0dHdccPS34>&0f1hDo#Au{^o6`89q7i-e`2wCwISa^83#|_RRIqz5a*aw$EJn
zNAb1uhb~?E6Mc>J#(~=(d>Xvx_}`Cx>z0QOd2hdP&*PUrI@$W{C(5nY|KeQr`wQ#8
zTsivL58uDCKKk)@nFnI|@OOTVj=p!{#Lw@2_dlo3?fd1)gZqv=@b7tW=q&R&O$q-@