From 333d829a6f5430335396b7a591c6621f251aec40 Mon Sep 17 00:00:00 2001 From: Kabbone <tobias@opel-online.de> Date: Tue, 27 May 2025 15:24:34 +0200 Subject: [PATCH] change whatsapp module --- modules/services/server/matrix.nix | 68 ++++++------------- secrets/services/matrix/mautrix-signal.age | Bin 1550 -> 1548 bytes secrets/services/matrix/mautrix-whatsapp.age | Bin 1556 -> 1554 bytes 3 files changed, 19 insertions(+), 49 deletions(-) diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix index 5b0b388..868a2c7 100644 --- a/modules/services/server/matrix.nix +++ b/modules/services/server/matrix.nix @@ -83,37 +83,6 @@ in { }; }; - users = { - users = { - mautrix-whatsapp = { - uid = 3001; - group = "mautrix-whatsapp"; - isSystemUser = true; - }; - mautrix-telegram = { - uid = 3002; - group = "mautrix-telegram"; - isSystemUser = true; - }; - mautrix-signal = { - uid = 3003; - group = "mautrix-signal"; - isSystemUser = true; - }; - }; - groups = { - mautrix-whatsapp = { - gid = 3001; - }; - mautrix-telegram = { - gid = 3002; - }; - mautrix-signal = { - gid = 3003; - }; - }; - }; - services = { mautrix-telegram = { enable = true; @@ -185,6 +154,8 @@ in { appservice = { hostname = "127.0.0.1"; id = "signal"; + as_token = "$MAUTRIX_SIGNAL_AS_TOKEN"; + hs_token = "$MAUTRIX_SIGNAL_HS_TOKEN"; }; database = { type = "postgres"; @@ -230,11 +201,13 @@ in { appservice = { hostname = "127.0.0.1"; id = "whatsapp"; + as_token = "$MAUTRIX_WHATSAPP_AS_TOKEN"; + hs_token = "$MAUTRIX_WHATSAPP_HS_TOKEN"; + database = { + type = "postgres"; + uri = "$MAUTRIX_WHATSAPP_APPSERVICE_DATABASE"; + }; }; - database = { - type = "postgres"; - uri = "$MAUTRIX_WHATSAPP_APPSERVICE_DATABASE"; - }; encryption = { allow = true; default = true; @@ -244,27 +217,24 @@ in { }; pickle_key = "$MAUTRIX_WHATSAPP_ENCRYPTION_PICKLE_KEY"; }; - network = { - history_sync = { - request_full_sync = true; - }; - }; - backfill = { - enabled = true; - }; bridge = { + history_sync.request_full_sync = true; + encryption = { + allow = true; + default = true; + verification_levels = { + receive = "cross-signed-untrusted"; + send = "cross-signed-untrusted"; + }; + pickle_key = "$MAUTRIX_WHATSAPP_ENCRYPTION_PICKLE_KEY"; + }; + private_chat_portal_meta = true; permissions = { "@kabbone:kabtop.de" = "admin"; }; }; logging = { min_level = "warn"; - writers = [ - { - format = "pretty-colored"; - type = "stdout"; - } - ]; }; }; }; diff --git a/secrets/services/matrix/mautrix-signal.age b/secrets/services/matrix/mautrix-signal.age index 6690c129ac504f80a547a37ac075212f4b0cd4ac..2bf97ac42793a17b672ef92453ac5587292d7052 100644 GIT binary patch delta 1522 zcmeC<>EW56Q(s=<;*sYRkmMO*T2@(L>FJ&8XBwDqVi1t%<LIUBQ&t+4>E=@sWbPka z&gB*0o)oHW>=ssKoNH8)>73!DT~g+#@0(lV?wx3yo0F4T>aMNt<!9s)$)#(jP+Xj$ zTU4B=5LS}qUJ%HYo*L*`Rg{vNloI6<>13SZ?p~f4T3?n_=9f|6n3C(J?ctZ~@0pnq z>X%!Y=j4%8<y>OqTjt_rkZqRhnBnK-!xfrgT9j|<ofukfX<3mImF?#f5#U>Fm>l3& zVH}iU;+2t=l3G=0XqaT=9U4>>k`<X1mQxz!T;b*IrJZJAZom~`=2TQx;$sw$mYY}{ zloeu`TJK%r<x_5ymyzn{Z|dt_SX!lDsbA<A5a{Zcnd)em<Co{+<?Lc+YEYSCsGXI= zm1k<=>St=8T~rm6k{;pgnwM1W7Z@JlTjrjmUuux!6ciAa6qfE?<r5eXT$bZ%Q0VP# z<Q3*+Y*|vCRh;LR&gEAYXyz4`=IS2o9N-e^QJ<dXQCU)0l5XN=Vi4)>>r)g|8d^}9 zZ;)YB?yX%C9vKnr@2(%3o>r1#SmIQW;}ppi>Emx%<mK&>ms#mo5ai;YYT}jUlkVx^ zm28<7YND+lY+e@Zs$E%}TUuriW?<}{9pzGD;^-4(;go1$ks9vERpM8kW$GRjZc^x< zRG*faR$LY2>R(xCX_%s2;G1Kj9T^l+l^bqm>J@2Zk>^?Dq#qiT6I$h$9FUk9niLS~ znZs3;<>r%C8Bkzo;GgVPl@wqZX%t`>s-5W{QsJB8;%4fUV&UYH=9HV2XklOwSZQow zQB|(*?2=X$=xSV*Q(ng9V;q$c5>{U1R&SE*?iS%=Q0QA27^oi=Y7%J><(QOS=2U4J zV&sxo?iu1zU|4EVVqh4Vo|Bm88{w57mTKgh$mJPW?jDgF9#HCUp5j#&P+1xhR%K*d z73`R2>|0Qtk{s?9o|@wq5|&jGnd2G}mTc%2?h|C-m0IcS92J_Ek;`RS<{6P{Uhn3Y z<q{MY>f@bUl$sWlpW_}`ke_85>8hO;?&g;gXpmzNVi5>R%>|idx&=n2W(w&=LFT6A z3XT?$QTb_6shP>4?j^}Z75<(so-PqlmL@@|M&XtoK7Ls)S$^)u+9`%Exm=bmnHgoy zj;<k<87WR>Ar_9sAteSThTbLhLB?h-rbRxvh1%wU-u~w41tut#1qG&;1_mlP7FSlK zln1+(RV1cFmgN_fgp`$exmNm?o2OPr87GHEdbovnN2Vkhq$LG$1?PkY`(<e-xup1d zS{k_&r&t!b6oiy{2Pfr+mPfg`m=t<tIS2U|M+F&h)$8i&Dg*==h2*B28oGO1<QV%| zcw`ltRa%A{`$c3L>N{lzxFqEz78ZCXhGc{qa23Af(^J)5Y`oA_R)3LO=N;#p-E6au zZ&q2ZD(cDRT>o-~!sdJXHvIa1<H)yd!b0~aU)~rb#rSUX?wZL{&h;e6%!``6{jB^H z>yCo?yDHN+GS@%)HUFw^v+k8RDN_UMC;z;n9#1(QF|k^_{>|UF!RlqFixR}$ZXLCp zxTj{R&VdQ?%i15`UX=gw-v-?n*6_EVntJ>aV=E8!pZey1P$u!r0j7VstG5*#Z4!|G zcShdt(RcL|VM)acADoFkCfQc`{`uvS7;k|~e2czH{+;^h?)@`cw$xAPY-tX)O|`#o z|2D(=dS=0`(@vc$e{?uJ*DU{cWR?O$p-=oJtvY$bp6NSRg&I2XPPJx9|8q|D_nvIG zwO1p}cYB_HHCN-O{C8=Oe>Y}b@G<CRj(KS-@KEN~{xg4G{CBXM`*WeqjB7`dG}LN8 zUphB^n|D)K!|}q*|4kL2K37`%WH0yKD0lp$(3?chr2GvJvOX*P-QFO0F5J#qzJ7`u z|H>-ajl#V_0^i<zT9_63&THOgC-;}4{-=}@DynTJzD@jYW*M@M`Q}#MqMH-tJA9Pa j{a|d&WSR8h{i}tW9ts7?Tsd)j@}9|#n}Vhvnco5ctCL6Y delta 1524 zcmeC->EoH8Q*T=29+nqok?iUc;umff=9;M;kz5s6SzJ+2SYF|38SGl>nv<AjoD^>C z$Yo+)R#jyhlxtd0Tp5_|pPg7#<P+v(6jq#Tq#ayo;_hfzR%zx}TIB1W%%y9mP+Xj$ zTU4B=5LS}qUJ%F?SnOYEW*Xoe>RxVC9uOXqSePE-R_|0$nO2daUs$9aY+PDun4aa4 z6_M%d<dI?OUm0YPof2x99a>rGZQ^C>$5rl@5$<EI?^@s(<rJP}Y3^%UkzJme<zta$ z9^si<7MWgD9vW;I;%AZ>kQWwgQe=@_>YJ2N<!YXh=oA!Gp2Ah+>Xl*W<zZQ6WRO{u zAMTjsR&SV9T$SWntRGn5V_6jxWRx0Mm8)&)uU&5L9bS=W?pA43P?~Fz>62oVX=d)l z6=0qc=oFc6YGDzTWmKG76p)*58J6ps?d9%XSQ%lMZ{}a@78>LlQeI(R<>sjE92J)3 zV`1i46yf0+7#^Nz%4O~v=Huw&UuNm&mROV$TyN^(?Hdpkm>-axRAL@#k?&Mu?&BAj zpXZyKo0pYk;%l0mlIE0E<mP2q6rO5O9vsdUmSb9!QWa*JZsd}ZQczfuk#3n?<XvtQ z=3l9wTag(Q;$GrWoSqux6X2Mc7U&p~<)`mhRZ&^)ZxkMAnWvr3l@b^k=3ZRond2B% zQ15T<Ugn<XUJx0XYMhc4UhETE9+dAMR+3#9R^m~W<{0dn8R?a6Y3^c?mG7@z<e8V` zYQ`0m=4TdB7Fm>(=bK*OnO$KPnp<2}=~b3q5u99@o)Q|BU6fkj<YH!G;aTY&66IMC z;*_6Uo{>^iSri&tl4!;iZdp=VT;>w$Q}5}lADI%8mK%{AnB*N|Vo_>dq#t2w6yUGz z5m6A7lau4`9Tgs!?wl4Gnw}S8mggOm<n5DJ$Yqq7k(!a@R1j5`7-W{_o9blX=5Fa$ z5gh21XqM?;U=rdJRqmdupW*Lgm=PA`oa&z+<>lmRSmxwh6yy?Rp2lSv9%Wz@Snpp^ z6q-~NU|F0I<mcj5?w{ovWt16_>y+Z-mh9nDS(;v9k`W0?%>|idx&=n2W(w&=LFT6A z3XYa#B}ta4#zv(c0nP!H$%ct(IsR$s9+^4DCZ1l2#TkJXsd<TJ1_c3$DO_3JW+_nx zX(nb~VM&$Ap@p8lrf!xV8NPY-<;9Mk2Hr_2o*t$Cg?=s;C7vjj1qG&;1_mlP7N;f# zq*^AY8akN<XPH@K73BJQl~=e28#-Dz2ZlQql%z*RmE<Mm2RUVPrAOrX6#ACw=LR}E z=X&{+h4@;U2d4NJlo=+udphNq6&eRc1?J_I1{hj!)$8i&DpZ)3rWyw)7Pw_sc}C@B zS%jISnMNd;8af3yW~TcGg&OF4=cZ;Cr4)q+a;X;@?QM@z-uCYM2UWZ87ZL(h-%dTU zp?ZxOzhb7_k&;SXPFW8TlcvLSD!ja}Tv>W?lI7Ftt&t5S{#i@xE`5KK>R{I8UKk{4 zu)*}8(1FeK>$4UeONe~#lQJ=8Nt>8iaMNSYhzaG@-5cY%SIpgg@8RiNB}q42J_)5* z?}#jN<eDyIzJuX+?CM!2OwB(oz4iCgvOnJN^bK3-wy<e;{-(}Jj%jpQ5q*s_L0X+9 zV?mH?_|fPrX&Yvbl!Naa`~C#wq?i14Rc60#R`oh-@0#qSs~hV3H|yKQo_Jy{WA}Zg zmdCtX>IL&AU$~yOsA&t^!)X^DJc?SpdwNff`^9Q*DKY++d`D)pbyc@4`LVMvTry?R z#65rHF6m`2z3;c&=l+js-zzeK3Ry3f*)@gFUVYr(h-LMS9T6rzn!HP#nU^#*-7wR8 zEc8;<$<1KVp@KhA<+az1C31t9<}KXe?pX42Yf<(2ovaCSJn!vY(|^_Ia57KFDow8F zHqpIDvt{RhxRtQ|)YnU^1^&o#lznyHzVLZ=ONy|KRe9`kRo;lo?N@w+Q`vr&y}zm^ ie^9&R#^!?Gc~-I<zrrfEbiZAmwX10Lu1O9*e*yrM)j*g4 diff --git a/secrets/services/matrix/mautrix-whatsapp.age b/secrets/services/matrix/mautrix-whatsapp.age index 8cd256fc74e27d6ae6a3f1933e3352f09a3e401b..3598cc333241f9f3332525a9568c9e03ada31ca5 100644 GIT binary patch delta 1528 zcmbQjGl^${PQ6o6u~%}jPpF}3vRRl}s-I7=bD&8?WJ<APg`0nlc4(P@p@Cz0RkE*3 zGM8Icc~E9%S(ar*VTOKIl%H=&cx958rDssGXGxlep}%KovV}!Psd>6%IhU@TLUD11 zZc%ZfLRd+bdqE(VSEg}5VQQIvMv1e#Q&CB{Q)*deS-qupR#u9EQF6F*n7>z*d0v@M zWqzhta(Rh`p>uJuVR)8VMx}FhPF{|sKUa8KWTAhQuTx%uQDI6@U~ouLps}{Gah_Xc zdbqEVM|ebLXlZhlkwH*$m~(kfP==w0x1VRFpNVH;Xt=gnxi*)6Mx>!}u2Ej3i-l`a zN=b#Ge!XvTa9(<9ez|X8er`^RTe@R#xq)|TX=GGpl1s3+lfI{iQ>J#YMR{IeQdxQg zS9!UUnMHV}e|D8cYK1{*WWIT3Re73kZeV7XkF#Y)zILufnrUQIrb%L8aFwfDu7zj5 zZ;_>wZ?R{-zFWR&1y^BIlCOnnW>vC5Muk&uMZKGkakguENnS`+PL-vRv1MwWi)C7c zMMa2(g^6~Or@2>EnsGr!X<CqZRE2+<Pq-Uba8Yiqf3lfnR(V!>rAw}1j*+E)epP;& zOI4XsrM9P|Yh*=UM1fzHvrB$Tgp+ZVqmg@Vs+oUymW5A|Q?geQSEZ42Ku~04g+Yo* zc71_afM1w@YEG29g@0a>Ym%!)W}-`~nX^l2h;~6*M6PpUh?7BPYFKuuUto}Bh<ik7 zNG_L2Xi1b$YLIbYdS#fAsi(VnctD6jj;Tq0Vt$27N`=3vPhdofc2RkmOJ+fCrgv&; zdS<z6p=nl;hh>mgV7@Pxad>99fn`QPS$$}dYeiysKv9`@v0-+&VZKjjc!8m#L3VMG zXI@yihqi}VX}G&du}grlL1nr}lyhlGM51}630HENTT+xoYMFCpq_J6eeq^YBVT7lC zVU?j}NmYt-RbIZOvtNpFZeEp>L7sWKqrZMeczRKwNp?m+k$ZM_b~sl+acF@>V7-rH zv3^iiUU;B$da#$iL4<d3L}^lDRaJpUN_mccQdGHPfPpV4H5X)-=@uB7nkl3g1(}<c zD>!PqTDqAe2j`jlr$)LNS)}9{It7_$7aA8iWv3N~l&3|wIi^^K`56a>J8~Hnr<-^g z<RrTnS!5Y{c;^?JB<B|x8JDNk`&$-d8EX4_1QofKJEptkB&DNR78ICX8W^bHXyD>u z?C)4+X%TAS6s8}U;bi3Onq;139&B3RTJBYt>0}&SV3eEZ9bulz<z`qCRS=vUk`Yzr zR+^b-<mVM!8XDo~;g%L`m|N=QR9KK28k}PsWl@^VRj;e7t6=D27@DphnCoPgWm4g9 zSf(G8n5J!Rkd#;9mFnc?ROaTKoo5hkUQk((%=JQ_IV;;EoT<_AsBnWEYo|%k|Mrb` zy*}S`A0IF&TWCCQ^~psZ*X8!y7faguPQ}U3w!*XG&1;*$ns<x~nU5VWdGh`EmzJFE z`xN*!Z32(m*Z1zJEAh*oxc*b(myE7#6Qv0c?cN19Phwgq{^s(>cB2Tr07kjL%XS{% z-nL=oix!R=_ct%syq)nn&8XJZB6CgY^L?B@Y^9{^L;kPPdOmq!BIE5Rty@jDTXNc3 z?r;8hF7uz96uZtB-jvqVEz*T?-qnm7+XH@PpAHO7dE>X>zK?P}SLnaZ>95M)&*V;s z{W+Ocv$H0!%2K`F?2wD@%nY$tT4wnPHP5#-)U4z`^8DU}zds^bCYKyvva!%*`=u*M zH;p$xikq@z*%6(`s!y(enkm1wd77-Y%(=dOcP{tzYA2_g<{oma+PC>l*vvN^J>@np zR<~4r5X$@a;6SdnVR~qLRZgL>tDxAX(#4kFBu}Z?Yt%kmxF=iD?9`>XJJeH;J1Nw+ zmFhNZd&qx{e}}-lOLcGOPL`RTeTs4E+d5&cUp$Xjr+5TM-96h9eB}`5d6S6Emx7Gq mpQL=B<6bg%n`-JL*4mw}Vhg=y-EsN-Y>(^S-hFQVchmt*nL^e8 delta 1530 zcmbQlGlge@PQ7zLVW@#uo|mz<fuTj9pLUUVWQno9Wnp=NZ*F#odq8<WP<XCiVx&by zC|5~ZQG{<=xPFFlsJ=^~SB9HKP-04nTe4?}lS`m!QAlZ0MP8|XT2`e|GMBEMLUD11 zZc%ZfLRd+bdqE(Vze}aLZ$*V?eu{std%91UX=s&!YrUs;aX@;pXF!T;Wo~7<fstQO zNtTIaS!hm}wuiGzn15w(Ns4Jkk$+iH3YTF-uDgeMwu@_!skeVhae;4<V`P<caCSvx zNPwYpVp^h?ub;8Gf4V_=qIP6~cX4P^seev^d6lPET6%Gci5pjbXo$aQWI%bklc}YD zN^z!hL48necBq+eqPt0%c0gpLMR<XsVPdvHpo@#IV`PAHSZIE@yJumAtA%%%dzE%L zmvga4qETLUp;twvr)iR_shfM6Pf@aeP<VQ3g;!aQn{h~)mrID7x1WhgQhH8dNwT(+ zQ(kaMXk=(unTL0lDOawsM|MO-cx04opkJA<d40L3r?0tblzv8Dia}Mlwnu?MxTkTh zV?|DGNQrNGaGHN^XnJ^rrB{x5UYcW>b7~}4v2%D*rB`ZhYKf~sVP!#3T7j8mVq|1? zo~NsetE;7}W0XN)mSbsVa%p60Qi*$pfs<E3P+(PMXjFiHVwpz-S7>%{W?pEntEGuq zVSQkEsbO-YdroRjYME2HNw&6As<D$_S*}Z{ze{4MZ*f+>tA(~{RA`vLnOT06zI$R| zQ7~6tq<&bMd$?g(QEH`crCFF;KytBHL8f1(Pl;tkL`jLWg-eQakZDGtp?SJ{S*B}+ zLAh^WdXY=Gvr%P^hhrdDp|_!Sc7=OxZhc<4o0(-=S&>0OX?k#gTasI;lXHGlUYSLv zp-Y~ZkF#lcd6=P_e{y+Pafo-Cp;wYyMv=2$8CPhyhf{KDuBV}IrbS|Inn_|=j((-9 zqqm7^QkH9ppObb<M3$q8Pl!QOa%He*U}3Rwsefp?en6#HK~#ZTRTx*PcSTi7UcIB2 zM|P-onRBYKUzk^pr?YEOuzy;rrFOA*O0Gd^YN@NXpGhbvH5X)-=@uB7nkl3g1(}<c zD>&v=x;vK^mPMAhd1Mp@=DFpRXPE@#<&-)G`)QYD2WA%;n);>b2l$70`EofM7=(vt zSLAsH_-X4GWduf)Ri#H7nrNHXr#hDhXZyRjx|kH1`dc~%m_?#k78ICX8W^bHSe93o zWm1rvS|03_7#VI{kXvaS5n5hU6cCt{Ym(_ynC9XdW|3cPmTg?gRb}B*nPpa-onzou zrJro!>=Nne5*|?KlV0T&l$hmJo|+yS7MvAqUY=LZRj;e7t6=ONl9uOOW?AW$Ta<4Q z9O0cC;h2_`Y?5!7?-o{A;cQ-!VwzJP<X-BT%q4c*-~VsxfwLdZi^@vfQ&_8#w|5n1 zDZjN)d$p4E`O`mtecdFlWxXNrmQhy?*Y~gw+)^g@x8*(9E*m6gWySlxYo5h=qkO*G zhUwp=50-nZsc(~b^KQkY4n?b$QqR&P#_8ILwGutSr}>}CGuzIU@Ncu<u4y54GlzMn z?Ve=*>)uvR-iSu7+imo;UwJ`AQt+*_{A`6<A7+XETR7E!zZbW|gtRG=p<&OaB;KCN zb49+sRN%f{<+UFc`poW={diAF>zTgK{aYAlzQ}o^!?T}SZ=ci`NiV6qyG1xVbMChn z9e4aYYv#PnEI)m~zRz{?jc10%QD*<53X3ea1bKBOcHf@b()EF5E5En15!a5c+`bR1 zw>>+2PvOhmKU2N-R`*J@Oq2TB<0bJwW{IWp<d>qWE=+ULGYLEEd#JXWUnI}ss*&P0 zvHi&|{=Ldy6&P+<Z!w$MT>L)T%I?I)FNVv%+ZW~Ejtto{yXyG*Q1+%pT%0UxXENV$ zE<Lr#V1`q9Nfl?21jk(!w)sZt2j=f)mv|}e7gRCzWVmUY;`Y@KR<`}qyqg&ua6jjx noBDQfEAyzT3EMQ3%GPP5O!aME&@r!EZ%)1Z+j++x^S%WD;srS|