From f505e55b6b436e512ffa871d7771f6381e0b1c6f Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Thu, 29 Dec 2022 13:42:49 +0100
Subject: [PATCH] services: matrix mautrix-telegram add registration

---
 modules/services/server/matrix.nix            |  34 ++++++++++--------
 secrets/secrets.nix                           |   1 +
 secrets/services/matrix/mautrix-telegram.age  | Bin 1485 -> 1721 bytes
 .../services/matrix/telegram-registration.age | Bin 0 -> 1797 bytes
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 secrets/services/matrix/telegram-registration.age

diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index 8e289ce..e29b72f 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -70,12 +70,12 @@ in {
             ];
           }
         ];
+        app_service_config_files = [
+#            "/var/lib/matrix-synapse/whatsapp-registration.yaml"
+            config.age.secrets."services/matrix/telegram-registration.yml".path;
+#            "/var/lib/matrix-synapse/signal-registration.yaml"
+        ];
     };
-#    app_service_config_files = [
-#        "/var/lib/matrix-synapse/whatsapp-registration.yaml"
-#        "/var/lib/matrix-synapse/telegram-registration.yaml"
-#        "/var/lib/matrix-synapse/signal-registration.yaml"
-#    ];
     extraConfigFiles = [
         config.age.secrets."services/matrix/synapse.yml".path
     ];
@@ -85,6 +85,10 @@ in {
      file = ../../../secrets/services/matrix/synapse.age;
      owner = "matrix-synapse";
   };
+  age.secrets."services/matrix/telegram-registration.yml" = {
+     file = ../../../secrets/services/matrix/telegram-registration.age;
+     owner = "matrix-synapse";
+  };
 
   systemd.services = {
       matrix-synapse = {
@@ -94,30 +98,30 @@ in {
 
   users = {
     users = {
-      mautrix_whatsapp = {
+      mautrix-whatsapp = {
         uid = 3001;
-        group = "mautrix_whatsapp";
+        group = "mautrix-whatsapp";
         isSystemUser = true;
       };
-      mautrix_telegram = {
+      mautrix-telegram = {
         uid = 3002;
-        group = "mautrix_telegram";
+        group = "mautrix-telegram";
         isSystemUser = true;
       };
-      mautrix_signal = {
+      mautrix-signal = {
         uid = 3003;
-        group = "mautrix_signal";
+        group = "mautrix-signal";
         isSystemUser = true;
       };
     };
     groups = {
-      mautrix_whatsapp = {
+      mautrix-whatsapp = {
         gid = 3001;
       };
-      mautrix_telegram = {
+      mautrix-telegram = {
         gid = 3002;
       };
-      mautrix_signal = {
+      mautrix-signal = {
         gid = 3003;
       };
     };
@@ -169,7 +173,7 @@ in {
 
   age.secrets."services/matrix/mautrix-telegram.env" = {
      file = ../../../secrets/services/matrix/mautrix-telegram.age;
-     owner = "mautrix-telegram";
+     owner = "mautrix_telegram";
   };
 
 }
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 8a3601c..2b9565c 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -35,6 +35,7 @@ in
         "services/coturn/static-auth.age".publicKeys = servers ++ users;
         "services/matrix/synapse.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-telegram.age".publicKeys = servers ++ users;
+        "services/matrix/telegram-registration.age".publicKeys = servers ++ users;
         "services/nextcloud/adminpassFile.age".publicKeys = servers ++ users;
         "services/nextcloud/dbpassFile.age".publicKeys = servers ++ users;
     }
diff --git a/secrets/services/matrix/mautrix-telegram.age b/secrets/services/matrix/mautrix-telegram.age
index 7a3f3f02cb9da358d66c4aabc8edabe8bd945df2..e585f3489163fbef404fec6cd03aa0f4ba971ab2 100644
GIT binary patch
literal 1721
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
R`|PegGkaS9q+k3~;osP6i=_Yn

literal 1485
zcmY+DZ3x_i0fwpF+zgJ*4RkAo9dxU%=QYV)a=Fvunp~30<&s=-xm<G5O_N-byUQh)
zOLCW7+@zCD_MxbCV7IxIjul(ykgna7(oS0KL@QQh*vdexl`$$sp;KBv&`$7&y#L>a
z7oOK}?UEf>(JD;FvtaWqa=|4Glx`}-@u*}E%P0!h3xQ2#mQ)yLLDgh=8$^uaAPHen
z94B#uFzPFn2Sdw2K~&7>DpJp4prYuM2f?9`YJS8IXS^_)v)O8%R~uR0o%@EknCcBf
zrZMX?S`-_Fellr>62SBn7*zAL7`5a!I-T-f8xu9x7IbD#S;Zvss{~Vyk|}B`zDe<v
zKC~L+NbnZJUNDmxfLV=JV|@{th#b_Vwm*Q14k)&imTFY25!>bl{o-oH)l?aBx*o#$
zl1vdaI@Qt8@KU7;ER9y9n$RN_cl;11Yo=P`6%Z9@K5D><*0dE-h1fC(R{NMwchX2N
z3My+rVJ&R%{a^qTD?L@O7mekV)ACH?n~D&2losx{27K25xj~$D%FqxO(D^KZRLNnq
zki&7QS8ipOsujSYC*_188=&C^c4q1^(PW3Rr`itUwq;E4C#g9qCrza{cif6J1}U@3
z4eR4Bl)+VF<N(^j)tDMCm>jG#mB6=9T%Sum*(n!wj{-exKAGT1f6{T~NaiM#*3vi_
zB;Z(Ks~+v-fP+?SGa^E;<%;&KNvoHphg{VsiW50rth!z|RC2p+7;Lvb$H{TOE2BCc
z^R>9l#%byU7B4%|s-3hg3#wXLS!es=0%zdGNbkk*aISiM*s1aEfZ?>1vmCNHq-@*<
z?Yx)xF%JWz7v<E9RB)0>Vlsq=y+LIHbEYTHxn?C=7-2hwd2iuyaz+f~Nn<{aRbqj<
z%ACHWX#gZ~yXQni9&mOQYUyUmS|ks4dYuM2)@d}CkP1&y9iPe(E>Oq>rt2vqCY02O
zmSn3414Y@C#9`g3)S98rOs9348Z4K-Erd`%C`U%MSs7p$I`%5a|2+=J%TicIs|7de
zVrW{xvsuyQ=HgH$Tv4W|ZVt1cnAN9vfF|vfh3%=8uO=A1L@i)c&e(CYhZ9b&^G4Ub
z6vl@H3qf>KMO~GRU3j3|LMQV+$LdP%LXrwNs-lQ3YuKp6<=s#->e-;2^#u&0v;NYD
zMt<7YiwJ2#2?Y@C&ce2lepJckxhjrOOU4LTZfYxwZAJ6t7+M-?pR=Ogr~lk~N6C$B
zBeo0V##@BKhJv8oD1E;rHvoe)in$Up3J#P?r2?II1s}r(T@j5^p^r$QIY|{N9|q&h
z>iG`S3<-?mv|)e)Gk`|^aQAgrp1<Luvh&32r(U_`+@^aT+V}j;Ppy6YK)OQSJ$%!P
zYorJ5SH;tR`|V{LU;5(llg<CE|J_y5qrd*fm(Fh6{79xxcAl?&=g|A#{P_b?@ZXQm
zMy1Ug_RsF$7;Jx}K-{|d#I85D^{@T-&Gz19srPE*2Wt*P=eC2>?9Oe^UGc)+egFLT
zy?=gq`Mv5Bx0N5-w{GvQpYA}O+<tNA&%ScavA;)^U)&i#edhS-Ll2%>_e<}UJx9KJ
z*ZEV=ytd^>CqH`Ue+SPUyZ1NWJ^1)mR{6{N)?=@~_uj*2-hTeTHORj%_U`)DrZX4L
zp8R0PwU3?Hb<}+M>SIUOK6lyaE9>_DH~0%*PXDy&$H#W>IPkzr&v-|-Uij6sYq}e5
zxH~-SeErESM_${FeR#*CZ(V%j1M2<XM+dF#Yj$6E`|iIE{!uPoPrQpCfuY55e*YKN
gU2)ZYKe1ZZuRrt0Er<7ijk^4YSFhc3XwSDl0dM&vjsO4v

diff --git a/secrets/services/matrix/telegram-registration.age b/secrets/services/matrix/telegram-registration.age
new file mode 100644
index 0000000000000000000000000000000000000000..f410216a74844c7855b5d02c4d4ce4255f120318
GIT binary patch
literal 1797
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

literal 0
HcmV?d00001