From 13a2c70f97fa8f522af432a951dccfb9a9aefe29 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sun, 5 Oct 2025 23:09:27 +0100
Subject: [PATCH] hosts/vps1: fix mautrix double puppeting

---
 hosts/vps1/matrix.nix                           |   3 +++
 hosts/vps1/secrets/mautrix-signal-env.age       | Bin 556 -> 526 bytes
 hosts/vps1/secrets/mautrix-whatsapp-env.age     | Bin 484 -> 437 bytes
 ...87828b9c64dc5d6762e-mautrix-whatsapp-env.age |   8 --------
 ...7d566b3ad02189b6d105b-mautrix-signal-env.age | Bin 545 -> 0 bytes
 ...9da1e2cb1a12dea1953f4-mautrix-signal-env.age | Bin 0 -> 458 bytes
 ...930f798a32691ce17eb-mautrix-whatsapp-env.age |   8 ++++++++
 7 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 secrets/rekeyed/vps1/28a626290761387828b9c64dc5d6762e-mautrix-whatsapp-env.age
 delete mode 100644 secrets/rekeyed/vps1/33aa80cdd327d566b3ad02189b6d105b-mautrix-signal-env.age
 create mode 100644 secrets/rekeyed/vps1/4cbaed0c22d9da1e2cb1a12dea1953f4-mautrix-signal-env.age
 create mode 100644 secrets/rekeyed/vps1/6a6726d70ccca930f798a32691ce17eb-mautrix-whatsapp-env.age

diff --git a/hosts/vps1/matrix.nix b/hosts/vps1/matrix.nix
index c0b970c..f7d0863 100644
--- a/hosts/vps1/matrix.nix
+++ b/hosts/vps1/matrix.nix
@@ -49,6 +49,9 @@ let
       address = "https://${matrixSubdomain}";
       domain = serverName;
     };
+    double_puppet.secrets = {
+      "${serverName}" = "as_token:$MAUTRIX_DOUBLEPUPPET_TOKEN";
+    };
   };
   proxyConfig = ''
     proxy_set_header        Host $host;
diff --git a/hosts/vps1/secrets/mautrix-signal-env.age b/hosts/vps1/secrets/mautrix-signal-env.age
index ecbb3c6811a0c45bfe473058df425acaef46da7e..a384e5d5645f44185fa858698bfdc5c12192c012 100644
GIT binary patch
delta 494
zcmZ3((#JAEtG?9D%{;0wGg;f)FEiA_sKO=K!m}jBFF3Er(7?phrNG<2GSVX|z0f$@
zm8;OtTf4x_(=0p4$kD_wML#{P(z(DW$+)7_Jl#OQ$T`B($H>S%F~```kxSQ3AxJMf
zNME-|H@zq|u{c%1G|<!}O2J95LLtC6t1^bmI58{IqTVszt18sVGA+|3&m-S0EZ8%^
zHLWb&G21At#4FXq&p$8UGPxqv+pIK7J1o`6s30`l$<HXcK-(y=ip$H~%QDokDlj}O
z*uON_IK?HmIN34GsVdFHqueMX)F~?2F)zxIOIKG{AtTDf&oVb6*g4p^D#S8K-?1Xe
zG9^5$qTbY}NITc3q9UR+$iy^1H6uUUglqZUs?RH%7d`S)y?mCf{NIZYXXnhH_A^=Z
zwz|UP)d#$}1&l41Z8^REK%uPEDkk?INfBlf%r>5x)x52Md4|a@iCp(ak!M#QE_vK@
zgzHuN{?`fnEqH^c-|BmG-ER6rg=4YV%@NrXdiHO+AEuX_p5$So(8{i*puNmM%IkC)
zW5&#N;>~;6dUrjzt@z-5iqfOGSGX%Xlq@G6`Y=aG)bwAM;EWz+)mPuE=P?;}mCX5}
t%oDr$b$wcq_p3h+*QU?e*#5ZMmT9w9SkH=kIy$xuUXhEYy4<QY0syrQ!BqeN

delta 525
zcmeBUS;I0xtG>$Aq9os^GSuHNAUHfFH77XO$w|MeD$J|QsIWZ6BqA&&t0E#ZJv6zf
zkjpzi%gEI{v(h)vJTaoU!qO)wIMm(P)h)v)H_I?EE!o}FKgqAm*R!}hpG((HAxSkP
zUpKudHL*BVA=D}?%tlKgK_SpxH_JXv&rzXPr;^JjyxuS<BHz>4!rdp?%*Zj(#XUGJ
zyrd|@*Pz5PBEw5NImIY7$1p6!FeJ*uGATF3GEdtuD#JXn+|V^L+0Z4ND=8%^GF#ig
z-!C%HJiNfqFD<9cBgr!|Jkn3wxG2Lf)x<S9sXRBV)Gxro+_%a%(xjYAS65fT$D-UM
zr64M$sy;K=EjuwR%B{j6H83(i)X&8~*u<+UDbmHwFU8WdC?eIB>jXpXI|lLKmz#Rz
z_bZCNyz2LBaiC50_E%4?Cs*f~#Ln8Bt#_byi-PJMZLWV(6CA^?q^V76o}+QOE+YDm
zxmD>Anawp$(>)Cjo{v88VNUF$C2tMxALgGfX!?2blr#06ulW5Wcb?hdl)m4O`O+tI
zscrl`*QccDUN|nUc#(UnK<$D}n%!&+k%=dz<C4`*3oh%`G30r4<*g!9oZYsqXXGCq
z%yK-gC{}e{?)icH3DOY~TNzgU|9$A+7G5>qe6w38S&n+Eo)oLBmMf6It*5qt-|6i{
Yr3Vtczcr6!2)Bs0u&w;kw_m>;00L~vN&o-=

diff --git a/hosts/vps1/secrets/mautrix-whatsapp-env.age b/hosts/vps1/secrets/mautrix-whatsapp-env.age
index 8fd65dc7eed8adbf2129049f1922e0ec82060948..5cefa8741eee15dfc28827a4a9de2d3908ef89c6 100644
GIT binary patch
delta 405
zcmaFDyp?%^R=tHmWl~h8X<kx6K|xkdKys8}j(3!Co<~uIVWe}GuV+|@iC>_%Pmzab
zC6|Y5mQ%Q)MMz1mZ<be{Pef#8nP+mUx3*WAQ$UDEMwoeNia~Cssi{XnF_*5Lg1T;c
zQEFmwszS7pW_1x)T3%&Xpo>{%X_8-*fk#SSajHjXa($+Gcv*zDCzr0Su7Yn>VTEOd
zNlHnSLAjTyc8O=Qg+-u8Rg!sBgr!erq)AR>T1H};xoMuiBiF}!#xc8O{<Qn#dY_-Y
zIa@WC&7@v+`hmxjyf4i-{N_bg^-9lqQzX^3TZI<4=QIh_`Yhd+;mKne9#wtLA+0><
zUoE#P`&ACh`o*Q1*8^5X>{t1;mhZvjgLQ`t=4kE=dmnS3KbwOgBxyp&mbr?@JH?Lj
z`^&Fa4tti66Dd@r)N+Z}rN3eNk;A1Ep6|bU;-ab3QjSt*9W~$UHvCNc?tchf!>?ka
zwfpz6)YlKA*ZEEPrL}eEx#cUG_2tg&^nSDVr01+JEARY?pIZ2XuYO0#-1p|OnuawG
IU$j{P0FXMS_W%F@

delta 452
zcmdnW{DgUeR()xnVTyZ(S-M45SwNU^S!AAJerSGxwog_@n5DUKT269SNtkD0NlKYV
zC|8tMx_@|afKhmApsSl_ZbejDczT&pfti<AVui6svawURd1#=CscDXBK9{bYg0)eq
zs=tA5dQoa(ajJrIiDjINLPd1AhPJ7yLRr3pqDy*RLA`>#PBoWLnU6<!X;qnPW{H!3
zNLfT)S)zG)ws~f7UQW1qpuZ)TuCA_vYlK0#g`so0XS#lVj$2AdQdoMhe|A8=iE+4v
zVMdjIWo2ksxwA>8Ux+7HW#skSN39>E{Cj1l{Gd?Py;?@-VC<~GdmOoC8a_=g7~3zq
z#~(|3#$Q)2cAfX&CtEJ=dq=)83KlO|D!4GX=@WZqsPxh+ziT%etyuCbOlEuh=YK^W
z$EEVF2hZkYT%z*QVxofoN5hFVdo0!Oe-P|dW<L6+nybBm?QBlyar4UPcfP?w7x>xT
z+~pN}UmsaA{R_9pX2GO?ow4>0oLHUZHMrMg&E%WeQylTi#Fp#tZ~OP2iP-^1BrP|4
zE&OBmZ%bFk{D+q-Uv0miFP9|p)67LLq&B0<&T)P8=3lFKD;zuFrux*5_31j-GqM1=
Cm9!rK

diff --git a/secrets/rekeyed/vps1/28a626290761387828b9c64dc5d6762e-mautrix-whatsapp-env.age b/secrets/rekeyed/vps1/28a626290761387828b9c64dc5d6762e-mautrix-whatsapp-env.age
deleted file mode 100644
index c698b5f..0000000
--- a/secrets/rekeyed/vps1/28a626290761387828b9c64dc5d6762e-mautrix-whatsapp-env.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 lOyIlA /lISmmDOngpCBwSzDxvzEwuYzfF7+HvVx79t63wW30o
-doVKg72Ayle+ZaLY70mxOzQQQ9h1PbrIuqjTRhOQobs
--> 31A;]V-grease tT@4m2=P
-UElYAFZWQ2JzWKFWanbljMj5JA3n7D0s
---- 4p3W3tOSNKA0vMKKAIxGWYHjKXssvdalTwawCr0efpo
-��U�n[y���8'@�µ#�5(x�ig>�ܱ �u{�ݻ�3�C\���v�A��@}��d����KCr
�Y{�Y#9q~�E�
-:�����֓jH+u�{7_�ʁ��h��_+4����'���4}�8=��G�d�����״{��/l��t���?J"�\xO��:Q�s�rG���È���;Po h)�$R<�X@�\_?��C�Y�4p�2��eR_��|1��(:�վ��
\ No newline at end of file
diff --git a/secrets/rekeyed/vps1/33aa80cdd327d566b3ad02189b6d105b-mautrix-signal-env.age b/secrets/rekeyed/vps1/33aa80cdd327d566b3ad02189b6d105b-mautrix-signal-env.age
deleted file mode 100644
index 8930742fbaf678e8d6bedfbbe4faecc21d11b02e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 545
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7@vrpEaa2gmH}m%>
z%q(;CiZV+!D+nuhO>?gFcGWlcO$s!04hYSQbT08J@bu28DCbJ{HjFHHjB+<lGcOEx
z%@5D?Ff1#p^!BYZ^Y;#OGfz)<adbD$%+7KR4h7k!XqN4kkzpODn_iTfSe&YmqLdZt
zY!#wlV(evHp=_9-5N=rI=v$zWqo!|TW$(mQ7Uh<n>*$|XRA!Xx9q#K@>}^)=U8?V2
z<?WenoZ|19mf~lYl~?6mu3hR|VCw4Q9-5z)@8?$O;^S=MSg9Y(m8fr6WLZ^UT9R(+
zZDg30Y*?A=o?M#DrK_u}kgK1YY8dWYUgBh0>Z|Wj=;fd6<P_xQRvBVh6jtFEnw1om
z;+9t&WRM-o_3ORvE4SFHC5O!QlP`EC=<QZtqx^eLtN54gyE0s~SrfgsFjsfa>hYF-
zZMAh;Y>Vv7l^=CA=ex?CPr75F#yaIc|Al2<MaHjvw=u_?y@}>9n)9g7aJ~5tqkSvQ
z)AG;!YyD-AV9)i=(CNoA4Hvd8?^h&U$PCvs+UF7(9x`if-5%Ayhh8pG)3n>UQ*}xD
zo#>Kp{dcySG0GljG+vi;cuv#a*2iaf&#rSc?cR81;}Y=zF(w6Zud2q}mG#C~y#6kf
qG@51~_~Hc5eXcv=t|vAh^1Wc1(mVelL*do(a>3hQo;n=8=L-PiOw#uN

diff --git a/secrets/rekeyed/vps1/4cbaed0c22d9da1e2cb1a12dea1953f4-mautrix-signal-env.age b/secrets/rekeyed/vps1/4cbaed0c22d9da1e2cb1a12dea1953f4-mautrix-signal-env.age
new file mode 100644
index 0000000000000000000000000000000000000000..9999d20cf4e75a8db890f3b430352df2445e1288
GIT binary patch
literal 458
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7@vrpEaa1tzD=rQ$
zHAwMyv+yj{*RL#$s0{K8@W?1MG|lkv3@M7LibyZ>tnf|DN#+U)sWS1Y3b6=|$V|-C
zb}G$IaZdCsu+aDNGVln`%`yrIk1VSw3ogtL^aR<a<zMHnn_iTfSe&ZhXC08r6_V)V
zsqGV<UF4sal3U_rp`Bfl<6#~g9%)+c;b)c+=@pO|XzXk5;U8FF;BREWrK_u}Q0Zr6
z9F(1ISQ2QI9~NcgQS28PmYQCX>SyU}5MGj&n4fG>QBiJK?wf7Gb+XB4VQI}mt7QyR
z7eqWXY1BUB8=tjf>AP-a#-+Qwt>;I!oI5N2^x~eKQKb`P)>lvV6Vv@_+thb`-4V%&
z40q0CKR9*nvfpBlyYq@3|LvL_x17^JUva%x!?Bb9(wGj2KHt-M=I5l-4kmm{w&rd8
ze!WgCb<??bcRf!R{j2_B9UGOz6ud9gX>q;gq%*;v|1OKPxqp9^!rmtn?xg-zFW$0l
z`pulp>sZ7$u{)frvDnwu5Nr1TpY(6hvg)@58A_7cKMx;zIQh8J)+4JA7~W&ZuC-zJ
IyL)yM0J}23&j0`b

literal 0
HcmV?d00001

diff --git a/secrets/rekeyed/vps1/6a6726d70ccca930f798a32691ce17eb-mautrix-whatsapp-env.age b/secrets/rekeyed/vps1/6a6726d70ccca930f798a32691ce17eb-mautrix-whatsapp-env.age
new file mode 100644
index 0000000..885c0c2
--- /dev/null
+++ b/secrets/rekeyed/vps1/6a6726d70ccca930f798a32691ce17eb-mautrix-whatsapp-env.age
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 lOyIlA ZQWnreUg4ob9RmEKNrdJKWGRCC1k0HWc8op8ycG5uXU
+U6SEQWo1DoLxclnhkXJy3D93nuijiD4kk9qjMk61Yis
+-> b(/|-grease
+CUalICYuF4P5Ipe5C6gdrw
+--- OmIGQ6VJYZcCIkTPapXNIMJswGczS/1bp8A+AeAj0yU
+�M�l�nY�K-��G�^\����k(�Z�����Z�$-=(�������H���=4��ً#�Y
�7���tnݍg�p>`��E�B
$ ��0����8BWO��ُ)�(��U�"Ͻ�54U�G��oȥ?��u�A��
+z`�d3Ij`�Ҁ�SK�
�}$����8%�����9�����?1tZ�Av´+�J��ϝZ�u�ls�kJ+-�h����
\ No newline at end of file