From 95849b98388dedcf81d56e80ee446c27bce970eb Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Tue, 24 Jun 2025 14:48:14 +0200
Subject: [PATCH] update forgejo CI runner over VPN

---
 infra/forgejo-ci/flake-part.nix       |   4 +--
 keys/contributors/procolix            |   1 +
 secrets/forgejo-database-password.age | Bin 887 -> 1253 bytes
 secrets/forgejo-email-password.age    |  41 +++++++++++++++-----------
 secrets/forgejo-runner-token.age      |  38 +++++++++++++++---------
 secrets/panel-secret-key.age          |  39 ++++++++++++++----------
 secrets/panel-ssh-key.age             | Bin 1271 -> 1637 bytes
 secrets/wiki-basicauth-htpasswd.age   | Bin 939 -> 1305 bytes
 secrets/wiki-password.age             |  39 ++++++++++++++----------
 secrets/wiki-smtp-password.age        |  39 ++++++++++++++----------
 10 files changed, 120 insertions(+), 81 deletions(-)
 create mode 100644 keys/contributors/procolix

diff --git a/infra/forgejo-ci/flake-part.nix b/infra/forgejo-ci/flake-part.nix
index 9bb9c4d9..755f045b 100644
--- a/infra/forgejo-ci/flake-part.nix
+++ b/infra/forgejo-ci/flake-part.nix
@@ -27,8 +27,8 @@ in
         imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
 
         ssh = {
-          host = "45.142.234.216";
-          opts = "-J orianne"; # FIXME
+          host = "192.168.201.65";
+          opts = "-i ~/.ssh/procolix-id_rsa";
           hostPublicKey = hostPublicKey;
         };
 
diff --git a/keys/contributors/procolix b/keys/contributors/procolix
new file mode 100644
index 00000000..dd66950b
--- /dev/null
+++ b/keys/contributors/procolix
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuT3C0f3nyQ7SwUvXcFmEYEgwL+crY6iK0Bhoi9yfn4soz3fhfMKyKSwc/0RIlRnrz3xnkyJiV0vFeU7AC1ixbGCS3T9uc0G1x0Yedd9n2yR8ZJmkdyfjZ5KE4YvqZ3f6UZn5Mtj+7tGmyp+ee+clLSHzsqeyDiX0FIgFmqiiAVJD6qeKPFAHeWz9b2MOXIBIw+fSLOpx0rosCgesOmPc8lgFvo+dMKpSlPkCuGLBPj2ObT4sLjc98NC5z8sNJMu3o5bMbiCDR9JWgx9nKj+NlALwk3Y/nzHSL/DNcnP5vz2zbX2CBKjx6ju0IXh6YKlJJVyMsH9QjwYkgDQVmy8amQ== procolix@sshnode2
diff --git a/secrets/forgejo-database-password.age b/secrets/forgejo-database-password.age
index 0d8488d70a9e843312b7e2bef1a939a7688ffb46..5682eb58ddd95ddc06848c6ab957e0882f073437 100644
GIT binary patch
literal 1253
zcmZY7Ij-wu00m&GSGYthAT6>ko?<(GNJySz$MF~sN%b6$@eu!>;z6%LVgrbVmNh^D
zi(ml=QBbh}Xy1j~(A>9y^XcfEFiW12d(<spxHb1Lnl3{g81(ejrtkBoB*sY+V>T*?
zaE#sHC1X+KNQ~swbXx2x6K69B@mRDJH>ITpYctH7c7&Hj5ILF6q-h{2(^ZQPI3e5N
zPK?nOdx+;$wXX+;4y;J?bmg_ivHi|sH;0QNp&^0HtQnD!d%>hrDFV1B1sR}7>8m){
z3T9ad0t(gfGK3eq9StL-X8p=a+^|Yk53UJ!oA2vHSs5)k3rw-EwI;RhRkrC1##yzV
z7`3XouO+@zFj#usH#oT+4!|&#oU)es0Rk2}@{(4E&M{^3L(e!%1@_JkmspGM(NtR7
zU8Ty(dGDxR^IGGL9z591>c_rP*i2Jf7<)-pN?|2*06_&#w!JNTozk!dwo*c9ps2s+
zA(eNlWyKB*M*uF!!4e`DEV6y5kM+XcrpP+Wi1k{-gYJ|~8_rxj-iNV~=;V0e+Qc1B
zvN_K>>blLE@&>~S%6vj#B7;PJfzwRa9vn@$((JVe7x4jF#kwcaN;(P(iKs)vPM43g
za8i>!yGgPG?ZwHgW){|MV<gI?QdCok-JiXDMUnZEJsN&b2@VRG#F$^3Sk;$7;4}}I
z0zN24nHZydtCq6U4I8cUMeF+G|J}Mi+yH~@x(rgl`KWm(HuN*rliTP>P15WR3GG{q
z=(p3H?6(&Sp&5H30|YDv6%v@6Acene!mWuyrL_h4QN*>Hy$uDrOU{oAnjHb+#QL!w
z0q{W>38W*14V>_(z~q31NqE=?j^^t*1zB^#5HulGuqog5PDvc1Gq=-ZjVT?}c7eg}
zWsQ{!S+~V$F44*x<?()0Ckb8yx@DkoSgzt2Cz>m}w~3F-HBZL4ec8j$uvG9vN2?F<
zOJKO$)qZlXgj6D9rMqk?*51E-F<M&Q7F2eB*i)+Lr|WXSz<TKV$3Ebe>y08UZ&!7G
z^jM78mVInF3oOk{8odn{Ue2Ljxb8ghJ{c=&+asz^G0gZMZ7YR1DNGwVi&25F3zo0O
z8FTLBX)O@RG<@r*C8EAid)!q+o(pdo1n)SDbrokxFXy6&;d4_eH|`v%MIS6g%@oJe
zYFPQ&0TFt7dfL#S7wkSQByoGz$P+MoRzZSul>@(~RcZ3&nhV?GMH))zk57L44u1dF
w_1*KE59RNFzx@<Ezj^!h_1k|x)8}tKr+*BDFW-TGe);h8uRr|s{QaN*0ok{mdjJ3c

literal 887
zcmZY4yY8!W007{`MP+yJL=$#WDNqU|MgtT|;rFLdE(KyV+)F9<JIPtj8|Wjr`2@N+
zIGq<T4i3J6n~NrA(7isvm(Ne*O<acUQukR^epa<9I%3e~3%KiUn>fNr5@TSw4sncy
znK;sX7VpiS5xc6Xt>RX|NGkGqyh3CNz3Mt|A|nXI6ykTZ(1Ym4QKV_EiQt(Nc3A2x
zlrsBa6ykbMf+jgLDoQ_V9NW=43!6yp)Lx2>Tj!Dw0eQG)Ej7B+nNs|-3_MPC=h?|P
zi=UvCyG$?Up<Yf@KM9j{><ZakTy0{4o|{R<&+ph`B92R2&svq}<s*f6RwW!<w2zdP
z2Cai}IcH&LSR$k0yTE!-v%|Q>%Bq|T(LBpHSV^#QdSFhArs70)8O>YMCAuh*$i2vw
z@-~$C?tdD8?&^_+r8x}pMgj<^?P3ZLu_EQcvJf88<~5r8V7quyHc!L)0#V}WHb=o-
zk{_wAr}tKpEQJi?u<1zOq#WWzo7aR6@ictC;ZAF&6MWg9eEP*cd5Tu5-nQ*(kJt%K
z<<iL+#2h10V>zlENU;<mN!4mr(p}PiFDfz-T*yqC^_o6X2A(eB)XJ)ZX#tA6&ze8U
zvBbhRIWh;<2&;IqUwTTqW?5(CV7nSI{}5MqT@^s@jx<A5P&H8W)&}hr>vqu|AP>PF
zh}`jy<t`d~QDX_L8|p~_<n~z;eVjZ@a3P0H>99ni$Cc6^sf$dNb_`~1Z09DpBM&*6
z_jjE+U1%sFb*gA}!#H#W=AnbZmgBtN7ioFn3CHJv-r9gk(9^wxHk%E6MU^6`923|W
z?(DC<tt*lmBc3!Gc*6*i<xN#$q_QE<&<9`V?|%RA_QUp*U-P%0!r%Y&&D$T}>3@7&
feES{s)%$<__WJK%UcL9{mp?cEeDvn?e~bSBi$fwl

diff --git a/secrets/forgejo-email-password.age b/secrets/forgejo-email-password.age
index ede91ddd..9d2dafe2 100644
--- a/secrets/forgejo-email-password.age
+++ b/secrets/forgejo-email-password.age
@@ -1,18 +1,25 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A ZyJtpgzBrA3WFa1+uiNLZieP6GAqYzAtjmUkgbqKwyA
-TeO/ghRNVJQrdeFAvgQITC6MC7x7IHDtFYqHVloVfAQ
--> ssh-ed25519 BAs8QA zIfPuCmSZyosDfWvL6A5DstWeBORDkjqb6Hxjx2dYgE
-Nq/YU6oDlIC+ROtM2P5aBeF6iJsxUbrU2LnLDRux35Y
--> ssh-ed25519 ofQnlg dm1bj8BJxD1MpFqdDkfDL4wWV7mjmb51hVqkk2uRfwE
-N7Bwhw1agAbNGaF57VmFKwIWeUibaYRSu2Ke1ZlXPLQ
--> ssh-ed25519 COspvA /DYoVVG4SOFgrIbMvEP0U7QpX6VK9otJVBYrj4I0dlo
-5EWys6IcMgrwW2p5fFeJEgDqandyiS1RzMvqGsN1X0I
--> ssh-ed25519 2XrTgw YW5gzijsL1oRa5vQ3PY+8o3iNZIji1BZfB9dGcg9QHA
-0WWu3F1Rpo9mi4YU2r3Jydr6Fg7bqWMuTtMJOEOj3NU
--> ssh-ed25519 awJeHA 8xl0RpXAJ7X5pe6qzDKXHJvMnjYEN85BS+maFytsSDQ
-MQYrdbh7w7TwGk2Wivja8acQYkmYZ2YWMkE/YA/5K3g
--> ssh-ed25519 Fa25Dw koR3KjKzS3Uei58I68qYkgxE0ifhIXKTblpD4cFAVhQ
-X7mQgsMY02VHyxJUVN5ml/QRVTjBDm7BD4w0g3Jwmq4
---- E6iHgNV3cjQrhNcZa6uqUwvGxf0ouNZpPXhet3Vicrw
-���F


Q/G���ʤT]�ns&[����&��
-Q(6p�M$ș����
\ No newline at end of file
+-> ssh-ed25519 Jpc21A ResZtR29w6WdlH3antEbqljYpGQw2wCnnoAy3TcMmHo
+Cdesc1l2bbIzxp4LYO+hokedMH68VKd0QEybGNoN2Ys
+-> ssh-ed25519 BAs8QA s7UNgS7n/lJsxqZGXiJbL30pGiRSmlrxyOcuAU9vcFM
+3nZSD9TNNgAS9M7D4o/DqANSqk4yLzbOPUMh5pgnlgM
+-> ssh-ed25519 ofQnlg 8HrnbX07z8pi5oiWex6X60kU9z+fGb68JL7l/Flepwo
+R++l/fsSOk/GbGu3YFL01fYtWNMHrpZeVFqh4QDV9Rs
+-> ssh-ed25519 COspvA +PjYkhDUrT7PI/qHfhvcI5OpRHtfEts8QqWK2qd7cg4
+z5dZ5w3YLvqgd9RazAeYfsp9rMZz0B+W+9klVpcY7Ts
+-> ssh-ed25519 2XrTgw xILuugvgvcmshmqC+/lqkf9IqNY3b7mOtXKc+Z8Ku1A
+GshKwp0q2kDkJNtsCJR+PpwArp8WwiURkDtVi0uxP5U
+-> ssh-ed25519 awJeHA 7hTDqzk1w2n4kvdP4aWZYMZw8YoGlYuHecySb3OzJmA
+Oiw8iALr6iDW2UtPrb2u4enGuCE/uSXsFY9YMF8mB8o
+-> ssh-rsa pO5rrg
+trQE/sebd+vMTz27qp33muYRVsxj41CTuaA11VQFUlQkNAmP52ohOsWPTMNOOw5m
+/M01CXFTELTtwTpcj7R83MZmTvJ0MRVmrVxMVNzsBIyPI+WhYsWQXxIffcG2MB+O
+cfIqySBhDGCWYGfWijsNX2YR6S2f3xPlHYdmFzn7HMPCf4UZKV6aksK62AFrGIHZ
+pJzW+NganSuweLC0oScP2v15Fhfq+EjYTzhXq2q/3bQX/CByq5XYmktiMJVCe35f
+vOb5PHfcQm0sXgT6PzkuOfREjk7prf1tXiWQ5Pb/GBNkpqLoNjzRBXr4ErtAMYGX
+ZPz+eiV2GHYTkkb3LPcHiA
+-> ssh-ed25519 Fa25Dw LMeOXTGtLX2qqQt24CTTnRf4fBSZhWakrbcjPgRlmyo
+A0/9Lyy6/Pvwr9GObYThmF51xinYxDrdhsCEd+v69yU
+--- Bgi/Hbp5OjBJFbMTYE0l+5s/xUaduh1tpXGqanQV56I
+�b#
+[F�֗!�����r`��S���%P���bx����DZ������
\ No newline at end of file
diff --git a/secrets/forgejo-runner-token.age b/secrets/forgejo-runner-token.age
index 7b99e673..c7d8dfd9 100644
--- a/secrets/forgejo-runner-token.age
+++ b/secrets/forgejo-runner-token.age
@@ -1,15 +1,25 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A N/T7HaInZ13IlJfzeli5nRz5pdBQETO6D1P8X42IHRw
-q431ZtsodQ9NgcWTjmS0Kx4ATwVFp2nkm+MHe7aXTZU
--> ssh-ed25519 BAs8QA +VUHgmz2oNG6L1FgZy3uGVMs6qUGirFHK8Ts2ghNLHs
-sjQu78xqM6KLmRiYd2o2uK/PjYLnyZihzVoCV7qKBX4
--> ssh-ed25519 ofQnlg cBfd95Ir33ggt1J1P2TkFRULr2uYPVuyrQ5XpjBxEW0
-TWFVHboXr95cFm5yjQ7gn7hjbSmVBfB/9dldsoga/9Q
--> ssh-ed25519 COspvA RMW9FlDmiQUu7cg0fKir55VqrDRCoYVVZMOcMHyrMj8
-qeXkWdKFJN7APgYh7AjyJLeQI2CAEaGAcXiVaBaOJwY
--> ssh-ed25519 2XrTgw BRobowRWZ9giVL2dFyGvzzF7gyWUQd1ounMQBtsM/lM
-dFyli2skTgzVWGVolLG2GuGNh/Xu3IaJsznOkcWqKGc
--> ssh-ed25519 awJeHA Cu7fiv+SL71oho/xoJMw/Lztf4WkNKmImVS/8xyLiTo
-3sB/t0squi1crjHFBaN6btrvGUeWaKfmGa7yxREvy2o
---- SqPDTJ/XV26nNG1ib5phNNRdQi5+Wk0cxhqUr1ygjGw
-�t�O�����Y���^�I��U�j��!
k‹Y.�^�}X���3�֎"kE������s�,0l+��n�;fW��
\ No newline at end of file
+-> ssh-ed25519 Jpc21A 5YVZwmmsBW1XCtm6gEVErkkNdLxoYtR/i7I4T79WQQI
+v8JQJN1I3BDP+8XhezeVAVl/Cc6jvKPYlwiT3+O5x3w
+-> ssh-ed25519 BAs8QA K9vO+kokOiKg5XHvTbIdSeC+WPTLHP/r5TQ2ySs3AHY
+gSXsyZraT3pPxSURXohpkR44ZuUHP2aXfmfMNqbZnZA
+-> ssh-ed25519 ofQnlg S+31bIhRpPG2ijrYd6RVDtPLoiH7FtREh+7upM1B6mU
+7YILiVq3nZ5+XMmXi5KhsnzQRZdI2Fum21/v7tfGBhM
+-> ssh-ed25519 COspvA kIiX95UPzbeOHBeLXPfahesfFpU2zlg0pAhsxJd1pWc
+aIZp2xv+JpKMj0mSVy3kU98Pvu3IPns+Yvz4aq0yhFA
+-> ssh-ed25519 2XrTgw joBq+DOUf944z/RpN3554eAb5EItlQbpEdpYMPtlVC0
+qyUb1c0g9OlAOkTTj+oMpn8I3oI4D4czhdnJ4oA3d80
+-> ssh-ed25519 awJeHA +bt39LTdJLhq4NG4T2wAS5PDSgYAYyNIpYgRO5lhvFk
+LbJOrKxtnOuMHRxQTtTYGJSnwuNCooFOawJU/xhnquw
+-> ssh-rsa pO5rrg
+cbw33rxD0P5OyfBjH1PwqSdN6DmhKyDZ8+JbJjs6hqblx1M2DX754POfMmOkQNBX
+hbCFc2jtLAU598rFwWBewfO4X4C/mT7JDHHN3WK1T8rq35QBN35rfIdNqjYQttt2
+mZ1KDtBKg3+FRkc7F9VL1SwsYkhnW1dz1esb6J1bnAxXHFQEwAX3F30O7to4c7my
+5t5bjJHPDuMZvNCWy8H5eA/AIuXZ5/OOA5z5lpWhtp+hNyVjWukrYr/PacdA5n9n
+gAm8z6fsEhdGkM9AK+P29lYFvWOnkzOtQ6bzSEHCSvxZcZ922n+grLmuUtMvMPo7
+bozXzZfCG7//SgxKdbE5TQ
+-> ssh-ed25519 8FIE3Q COBr0dcOY+LseUEl8pe2CzGVHZ1+h21s/qlGwoSwIRU
+Ea1XvW4QAXnd4L1t4TiAwb3m2wbLvcEcB8UowilQTVs
+--- X2cdDTgAGKfqFu1oaaDJWCWzNBw0q/BTy9rIIxuryTg
+
+5�o��ղs��W	�s,�E�=�k�-�	:��)Jq_�)���4�Q@�6������z)e�е.�RYQo8�:*8�
\ No newline at end of file
diff --git a/secrets/panel-secret-key.age b/secrets/panel-secret-key.age
index 4cea15dd..dbdac714 100644
--- a/secrets/panel-secret-key.age
+++ b/secrets/panel-secret-key.age
@@ -1,17 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A 98RNGhrNW+Pg5EeQ6wOgRNaPqauBrI0hnUGDyCpFsQ4
-5ZCq4vkp6N9/KR4Uf0e9MtNM1SHD3Pr97B31or6y8Xc
--> ssh-ed25519 BAs8QA znlRV7zbTUMsnDY/TiNgeCaqzi87jL/r/5dhc7bJ7hw
-9pwl5mcmbHaO39jmiuOkaC9mpyiS3xQSCd7q17gH6OU
--> ssh-ed25519 ofQnlg Wr8M7IpBjvNatOlfmRodoHicPjSjyMVqkC+R+18SYjk
-Th18PUYoo1TvP+d+6aXLvipsm3QPW+DKQSv8rJqeblk
--> ssh-ed25519 COspvA spxBYfEWDeKhaSsufZ4GDtIMKz8XznD4kS7Zjb4BLFU
-B2wT7+bXgWezmUIj0mpVPPjKOoIj7cDH16uvW4ujbss
--> ssh-ed25519 2XrTgw lY+t4jvdSgZ5ZKMemAN0u32fPUAraaGu+ExMEsR/c0w
-KfOBcGrhIztEnKKmsv6ZD6K9TleZRgIRWbOlG8Tcvaw
--> ssh-ed25519 awJeHA 1VVLZa0l8LX79LqZqlYRfXmKVIi9zpLcoysi0NQ3L0o
-m79gHUkQ87zFoB8Awlcxt2GrCMrwr5KSfyiSqa6kEko
--> ssh-ed25519 kXy85Q uaEXsQeApgXqzWZRL0AtsPqjt5qOWxoQjN1Keiii1Ds
-LtHUNkV3n/jgeAcEIyq03z84KKa5qQoAo1aaJeK6Duk
---- 6s4nA95ds+3slR3QtHQmAkTEBNlSOQusQzjaY/3M5Ds
-t�:�X���=����8�Oo�x��;��yI����̈��J/oW0Լ; x�$�t���,7�-a�
\ No newline at end of file
+-> ssh-ed25519 Jpc21A jDwFNrgZFlr0NojhQG+XBUso4hjbt8wDFe8AuUPftxA
+tHxEq9WjiGbrzWR/rapRoG5boC+y1Xowb7fvVW5pBZA
+-> ssh-ed25519 BAs8QA u8A7ObeEXsrSdGVgOG7skzzLmGV2UEPea1kZ0FklwEs
+ugU7+p3G/fYYNuKhSt+awRRuXr3/ipjmdWs2e5e2Z4s
+-> ssh-ed25519 ofQnlg vv8dTQSE1NZESo1UIkcO0TUsRewrpRE4lJnpFjOZWTY
+L68EVIrYN5PDcPkFno/GxTsypX8KQGXadlOzwW5/Zqo
+-> ssh-ed25519 COspvA rqop2NDM8qLfhJ5MGvlQ506QgI3SCi9qGedobVIlQHM
+LRYrRrcN7M+5lWJf94UzRp9cN4DQZz1uA/iO21hXE6s
+-> ssh-ed25519 2XrTgw BCLSRgucfM3ltMCwegAZg6E8kFWio5QlZdzGsT1jqAQ
+yWjKvTMVGXNG2mUhtCHpV27qzCH9Fpe8XdSQ+u7KdS0
+-> ssh-ed25519 awJeHA RbA0+BGjjtqFwAKgyU8iP1jMUjQAlG6jJHWjwR1UulA
+Xa875rmo9GxLvSxMhI8bSCPLinPnUeUCSzRqSweQPCg
+-> ssh-rsa pO5rrg
+pObun3kWV04r9bhEdAdDnsLKDgADeFlmIWitIpgpMMlukar8M4IpIaYu9dqnK7+C
+3zJvG9xQux8YuC0WRfJ+uPw+iBhbOzj7M9n9l5yP0DnwpJUlIvboVwBShW4QQcmd
+xyFhub2vL30axY3cX8hvJ/3cF8MXqoxiGWDjHbTHdLYWhA9o+IBQ9d3T6X+LvKjG
+UEIywXl07eYVpa2qfhBaWwSxeByYsO8dMEZIbGZXkM7nF+lxJe6vdoNxUk+lluJA
+fSsZFIde1AKHfCTQJOxEA0D2sYoz7UzLmNXy7Wimxzqr8m0yJpFlZf37/T1ULIlI
+RWshHM3ZhGp+w/BYrd1jmw
+-> ssh-ed25519 kXy85Q EMXeFt7NlW8BJB+8qdOm5M4jlB0emZ42M1iZXQ/XfXw
+CA0fvjAzaePbWxBD4ZDTlpWfhhU4qS7pb55eILxHKfo
+--- nmxNGml+BsgdlEr0gEdfsqoqFJoqTA96dtpkZlVRW4c
+M��=E�!!rY)��r��(�]��S�!��pW��Jg>��g��`M�$�C��ź68�=���yh1
\ No newline at end of file
diff --git a/secrets/panel-ssh-key.age b/secrets/panel-ssh-key.age
index 62e8d34599e5ccc121628eb18b139d330ba59012..edf5950e1e02f46773b1d632b0ec4525e7b55f3f 100644
GIT binary patch
literal 1637
zcmZY9+ppV%0mpF$t18^-Xd6;Rr&i0(so1D{n#9+5ow{Q?PMnM5#Fy9!9pE_5&6oHV
z$FW8W9UzUe%UM;bA#tigQKdqqR?{{RJOCSvPKe8<YCEd7)14s@4}j3RQdU)6U;0x1
zf{(txho9Cr77a)DXKpwgJG;hyKOJR(#XYGY7%UoH2t~6*s_g1emQ2xntHO6O8r_(%
zqCRVmETdME$NjNe5%|ssD+z>)u`_7Ma)2X(zFXuPN;&XVtcYgaiRj5K39D9d0(2y*
zttpsS#~75kS)<4x*C10O==e^Q7b<yq0Jgkpc0^Qyp%oX}1&OePNoLry2pT4Nr3HAd
zZs<in!=*K+>v1e1AViJ?XL>SZIJRN)5ihzktlXG>NgMYXj@3`a93OVeCLX!C(omyW
z-o&+OMRai+(>qwL6I4MVF~e-d;sC3gxUx3oAP8&ARf<M*OKgv;xzU81S)FDJB&oVH
zXxeR@ySa_#12-a530Rw$bW`M$q#y}hZaAqjq+0+p<6x@j!%oced9LU{1e^gpuUu5!
zIHN{pRLMq~Y?66Iuvn5{__E=lX^IZ&O*@YhU(z7em-^FG0GD!+JT|Nv4?|-l?J!`2
z#F1e`@J!uR`9vvMx*8jWAp*bw2H|zX8}+?x9t^4|QYuHGp$D++(SC0vg#kkJs*NI!
z+}x&3%LYrPVoQT&g$c!JlwifQS@J;2)N^3fS0LAKh7^;AFwlZwh6LQ2kfZ1_330aN
zj^t_)tyn}2s^sI)A4-0N!g*|n=U7|QZ)kp?rCc8M{XWpgE#07ExYEuv4LzqNTGmNg
z0c^*zM9kFdg9>ieqXJ(7(_FzKEs04~BM|TzUDJEK0w6JJfm*#HU{a(cF~^!T-fDYD
z%|{_nCy8p!jgYBVMzrGCLPMj{EKG7(qR11E6-+e&+9PrdQ=-^w3!D=&LdT8`RPewo
z(u2aXo+aHG!eo>XE43ywu3RW}2Sqdk25?cwVx~3(3~?YfL}4Uj#whPK)0076=L;i|
z6_RpG*Kyoo(ZV20PsX8Rw6Q!kqF7wUaK}Izq2EdX+$g#x>ceb@vC7?PrXzS=$H*F)
zX}zCt42S0_2{C%1+z?gP(nfks2?n-WlJjk-7RF70U<DR7#SyG_g*1^(44Ik1<c+m&
zJb<ara%dxEGqB<+Gi)k`N#u2Galo`o>h%=DcH0Wv)3ZrPL3MX5WdJ>+#u^?CU@8U!
z79BLQs?Bw<sY*2|aoU}9X04_T%Hc4)t}QO6qz>rU45UH~;zmKS5w2Jq)Knc8>qtfG
zq}5s|Lk`vI&HOR2^V6M68@4=lF245p{`CF7*s}fThLewOU)=EC-sk>zWY50a&wh<Q
zb=QI2;R1U6<##_@`Vn~I8_S;@ea*UbC3Sq`ts{^8_!;R!Q@Q2vR_*sMZr`xuu4ij6
zjNiC2UpX;%@eddG^}hd5SiJPZ)kpr>y?^h=_kGTtsdB>$*Dfh5!NMK(vGoTR;)PGH
zEuWq{clsE8`R7;97Jsm^6>t{5dFxA8*Ir-R^;-Gx>PP2a&JABW`|PKue_a37SJv8>
z-r4`#xy7SLu3>A-#<y=fMr_`D-}WtE{YmG|TP`gB?#chGzde7MJeGgpUgx{ao6@TX
z=il)Eeqh@+fC|>T=YlKEr}jJVo&IU?oz;IYJ^9Ybzf4!^r?x%TpVxkNPageH*>-p3
zt^A3?zRia=elL24e|_=Yxjm2n<8AlXCtrMDpWAU{>CvtJp+7Hg-T(NNyJ>U%gTdMt
zyZ!S=?v0+>@!1Ev4@gJ*e_UPK{KVzwA6|We_~_IF-}>+2^<vnk&F5B*&#&F_{_Uc4
zusMP3^PB$m8`j<wKW#ky@F+i7dEu2^8xNgX`r=O)4}N{mTMykCfB0bUR51SKBb&^9
PJDsa%|CO%%^$h%fUKdwi

literal 1271
zcmZY7`;XHE0KjoILS%v<7@{1+5sjzJxvg8f?TiQA*0r~->)PA8^+fOb*t)H~ty{bG
z5ez;EA_NctQ8_M3<S+^b0S`hzUI7$TJX8`;5Rkx$hDSuBXYld!`4@chO}?y{cjha6
z-Bh$vwem!@F1nf?o3q`nszqmB06@?aw8s=4@W6H=mh2#PT`hp&0_~4U-h2Xr;j~(@
z)RNd}p#GRk6LSh6(zp%NDh>j}qk5bQfx#3JhP-gJUKI%|=~1#epFt=MF*(donbBGZ
zRs$q#uK<Z=lq<#RyaAhD)1k3cAqsVp$!fU4&}2YSXouTqM06dtkqT`wxpKO|8{xcz
z7XuR4nU#@{ODzNv5TF(?)9veQ#E=j^TB{bwiY(gwk&=SsUA?-e+NkEdJQ_~MRJOwe
zGe|BCqZ}Jn43cNXFzvIIgK<|lEf$3YV39JR=L8AwXbKdbR#?DGA{d;(-2R$W<KWR+
zm{64_Y{$Hqs)qb7(~t|SM{#gbqe4TKyx?;1DaCN4y{TG00qS`#Z)?y+p3oUD&U4i)
zfCvPg6Dg=pHLNTO8X2$ONO?e$0eD&*tpT}uTGZ_o#NP~NQ)MD41@IDF7c9nS<$0Il
zP5C=QR<^4uCm6y=6?<_TW7M!tI0D8|SwpZ!iV1KCqsc|qVJMKML2*-(HK~hWAY`=0
z>ajcq+a*|F<2jDA*hYpy2}+{le9Gb_Tu_6>G9U|4A`O}KoV)C{1;`MZ#6i6bW`k50
zCHWW`XqpU%@jwg~B;E?UEvgIBaPog`QqBy3q`jVufLIFklOXipOd+}0<b1tRx*p<r
z3xZ9dQViyKAyR1;12)J983k6UXTni9SFXj}9+@d4s={P6HsFQfgjG>23=5+k-sW^V
z?PbJNb5c2)lABe^U1v4FQS~Ltk_SiAnPMr^&=S2M7cTH3W81m4@M>@ab7A-XpX4F*
z)S3kcUB{-9!^Ya*hi2OP$G61yeLnH>;weAs?N0K|{#9@M+OhA(4D{5{oNeC>xh~DJ
ztz7(dOXr%lt9z#od^YCr<vUt3L+f^&Kd_>2H`8ZM27f;D;iJ!N-o%adX$u!#-|*M#
zxBasI@4HU!?HznB_E7B%-hbuHQ<LW&z7>jgU3jl`c+Q65oj2DMyW3CS|J~cQ!L8B9
zcKx$C0<So9{pjk!mDzng?v~l5#cf}pv%k6_cLzJD?~g<CcU-%Zv`;yC(|;*)Zsf?k
zBO}kxJf3`E&Zc+b$3D60nADtbWn@L|+?FNntIr$2z{Gj0d`H{IKQQ;g(<iqN+%s+w
zh3#pD`z}sc@}=wGx8*(AKK$CQTeG?+{nmb(CpY#y_(7$=777KPT=r*uOk%;t3E;&O
zJGr)xmc)B{Ha~uPDfY-KxgYEY2H#4#-RrjxOk<Y6I9m>EJ$L==v=nuBd}Pw}sUP=t
zwY6rI>PyG(+ctwZdv>g+_0zVYEzb@gc=zS$w?{T%^ViboA6#_r@)ND)weO!A+Zb+y
cgw^o9O824H_AjERPuaC+)w*%>AHK2lUt=2Q<p2Nx

diff --git a/secrets/wiki-basicauth-htpasswd.age b/secrets/wiki-basicauth-htpasswd.age
index 059510dd929d1432fd29cf0b436815cdd9ab2ca9..de4588353cf59193962e2aa6547d69a41e5531ad 100644
GIT binary patch
literal 1305
zcmZY8yX)fw00(eE5Q%W0sDn6kk)K#<-f6N3dA3c`CQZ_$EhwaUKbrTeQ4qP&;imJP
zz3EoDa}W;vIh^2nlW>B|If<)-gWlru^ZN&UKk$XG9e6V@bE-?xM0xgMUIkzW1GA4N
zbsf$;7r}9unuvvi!1Tl*PnO=ndlFOJreCMHL{kzvm*<73lEfa}VR3oT7lDqDK)T`$
z4vg^O6nb1!m1~OV658BAy<0;zf;pHNugwmRsO?RSp=)wWPZ$~XvvH3FUUuXI84q36
zneLlLjT)h5pcwYZx<C84JFbB&nO6EKKBirq%Pniy4Qp61;|T*ub9H6+`4&Nf5p5m%
zrk4BLEDa|0T;8EoBkamEfsRzr?i7mJOJ<$milP?Bq0#251zDr828#F+ZMGVE7W8lt
zr*pUM`kf0F(^VzUxxmWNYPHUsrRh31HCCyMj-E(ydltf+lSebr3q~@LE#r!?Z)VMl
z6e-J~7l|M>O2dE?q2m`$VphCXx#5ddb*trLTgI&eAD<2Dz^Ir2vAxY;H#KBm89_e*
zo#iRW@wO37%SbkHrmO<xMFZ~|u85O6ib8N}$=F4>0>q)6LVH`z)*Gc>`pso^sl1cp
z5qjf!`>e#e4gyofM0n_?X7{4Eq$h-8tx-tZF=@!UOIlsvjUpymQJ%w|&cOl>4u)%(
zcE3LWD@55|R7V40zjlyB+o2~W=FFW6E|odSH%fj|v;=b^i2P5hYI{;BcvS^J<>`J?
zODz#`mN@Umy7Qw1!gs8wdQeU14$0&xUg@!QP|mIyWpmEo4$=C^q*QI~M?jGMWV3B_
z8@JYHUv^Pixd>!G!Ua^MyIS2ym6yyld`~fCRg2zG3uvEkjx8kBF^UjC;<!q3ngcSr
zs@aDb&dN(T$icAXH~M9@q<FK(s5Cf~1g-g{-Nhm^g$%Wh5gbzp9yrIa!gWf?>#EhC
zBypj`AUQ;Fx6G#lfk|$RtE&Uu2{bQi;{cAB6_3ZZ&AP#f7tsI^9lwG$GQ*l%C7TmD
zHI}KrfDA(!92riP6<CE^@L-%GH4zS&B<V}*qT&fM&k!B2EMN!_Qg@__MK2h6EVbd1
zJLLa9=>|+4_Y)!anoV<L(FRdXAsqyJ@A$`QA8J05LzGH{hqI&{cje#!tF>C2EjZOS
zxG}J&pb)XKTR1Y!vY^uAim)gT=ei1a_!^kaW|LK;h2~%xBB}(7U5_-S72~a=*)<pA
z=7MCK<$kD(F=qn+e*4>dZ~nOW^~=w$9=^N(G`te-Kj7|sf9I1w?*8-JqmQ3y;om=e
zald_b_4M#l`Skk1&)2X0^5C7@kNGF}KL6dD5!Wxh{@1OCf8KiX#>*4&(e*3OAAj?l
UdFzAszFOXW|JCo*uW#4ozrYW-PXGV_

literal 939
zcmZ9|y9?t40D$q~wv3`U=#ahCH17mKO`D{7w0S2@GhN<I(>Cv<2?z(`=Hw(O;@!Eq
z9XL50a*C6Kh>PGL$a#a)DfpPYx&OfTgU?Und3*`$v23&A@<vgoP!9w1x4@=3%;N~b
zahL|BGDKho<ht#i$vk(4F)$K$Fnt#HWH;OGc~X(+N-7%NbWT@;xKKbK<EyR9oHYb(
z;gSy0b5%GgriUF;?d5fdwJ6b3F&!7ft+r$uN@qZEFvhH96>GA!NoVYURXF*`XFRpj
zSV$eGR`v9_u()Xe)FHEWeU2$-JLRr^zvu))I9Uf)vGGGAyNN-_Lc^;LD&A^EqF+ua
zh+5$`*toFN=o@Obu0~Siy<yC~8d)}FudO=If=!{l=sK{<a5Y{Y5kFf|T}vND&fd0Y
zmF$ICDAgCIiwH)*F(rEO;pXH@eGy~8MN22>u0zF5kLi|l7%T#&#~JDJbv>>&K`DAG
z!slj{E&_$7YZ%27g$lKKwei^Kn6F#WFG*R*nEVoyma-wBapT*!8sgSgI)HoCYy7<~
z(EV0e=#}ZN57c@*7!I}#!sS}y6W*800$t@fklW@#3K*7|5kYxH{OH<GClOj4%`F~?
z%fw3}lY>a-jPGwXe~@B<0V5tgFAn<7rNadmPi&17atrZT1l!q}REA!3iOCq61y=xN
z(;^r;){LRDLwy-1DwLQhWv`K@+Kmx3<fwVE#w_{fR*TYQa~wd;-V31ywW)HE$NnT1
zk`XH54xRkKao|jF#a$v->5jgJK<g?;vvUL}g$e~PNSxPlo-g~1C(W2Q6*><p+vw9R
z%K`KG92|sn$tZM4@PvgQcxhcwoj^?$o9pawMWLgk$abrve$4@2{P5sw;Q2dW{&)Y?
z<jH$?@4R+?^QZ9XZ}y{m|31I-@cUPy_v4q$51)-m|M;u>_oTP~`Rwi|$?@Uq-}vvI
up8N?u{`va*qvdxk@+|q|uk*_b>c`@j*7)^AfAsA7`GXI>{q*CffBz4`NkPm2

diff --git a/secrets/wiki-password.age b/secrets/wiki-password.age
index d1bf3d9f..908f04e1 100644
--- a/secrets/wiki-password.age
+++ b/secrets/wiki-password.age
@@ -1,17 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A TUGMeCK5ZehSdtfH2xpEEvMp4jZxJ2fTogXSkcf6blg
-BY6cKeB3MV84KvYThJsU0TSW5kMUJpbVVvccVtwtEIg
--> ssh-ed25519 BAs8QA 9LgEP0N4MF4uEXLXGWRLgJzC9llYpKiP2lwAgN0ObxA
-cOI90Sc2ORgvFZD2I+oYcRa1Y47X2tuvFFqqKFo78nk
--> ssh-ed25519 ofQnlg LYTsntB2zI1EJ8yyYOH6BvHXEOv+zX7QYrd7leXPeDA
-uqhuPl2udjxDMIdMd88xpQuAZ/QMXSLgxOeOhHyTjW8
--> ssh-ed25519 COspvA geel/7vCPHmBT6Sg0bTqeUV4rA/i6w0NvFjGk8rF/VA
-8eIF+oWuM+16j1n//ndImjTPxPYqZ56WA8K5uybMbTo
--> ssh-ed25519 2XrTgw uCKoYMidpNwfo2YDb2jyjONZvExK2wrZXXvv+ywrCCA
-X0E+2LuftCF3oAHp8z18WRZePAYt6tEYjnNAgMmfUNo
--> ssh-ed25519 awJeHA 4cTdqU2X1gXyFxMHGHPgUq9g8XUM8sgbNa/NMl2GZmI
-J7cWCuKrf+r/nE0FjGj/DQDv7hBqbn0NidjY2m1mwGw
--> ssh-ed25519 dgBsjw gyI/oiqvAzqxtism9yCygXYLZzCynTdAlPBcwZhryCw
-pKCMRUv6dsH/cS2Tm/gU0mxH6TsF6UGj0Fx4BNvYv9o
---- MBLz1UcLi1SCQ2+tA1Zmv+2ZEiw0Ag2C4/gk7lzqJ0Q
-ڏ�˃��� �1��ޙ�Ȳ=HK��?G	�g
=R!̔2�t+܀!�ɈUG޶���M�?��O����
\ No newline at end of file
+-> ssh-ed25519 Jpc21A yis+v3hv2Q3Wu8Jb4X+HRwb28R2/+lgnhltvcKIHwkw
+Q+P+9kehHjGwxCVPOhwR/1m3UxXhapd/96rG+z8ovEc
+-> ssh-ed25519 BAs8QA ZqxQcoGjvF0fFt/8VBxdHr0ex/1NvbJoYLvo+LLSzgU
+1140B/QYORymambC5KscfAVDai/3WvkDotaz2IR/K9o
+-> ssh-ed25519 ofQnlg YjNRDvCvvKIup9cOBoYjML97LOHGQwHvxw1fkZIjkm0
+q1DsXV6ymegnmGWlZHIRAlHa7E88Z+IgvTuRm3VJ5S8
+-> ssh-ed25519 COspvA LbsIVCJCA3c6XumBNavBfIMlC+6uUzJG7Wd8UDfsmGo
+yD4u7VBe+3hX3RswOn9a5UwaONEeItWP47waPjKb8LE
+-> ssh-ed25519 2XrTgw lFi8xHU0crEaghwDjJpCrrNCijkbqzACpd2+/5xK+1k
+et+pCsjEz+5rnjj1WOgc8Dwlg0ck8oe2EvfzrnjoNcs
+-> ssh-ed25519 awJeHA yboqkh1SdMrGYYPBXusJo3umpnQm/Q+QJhLfS+sR+EE
+zuP5fDLsgSQURKeL1XGqKN1cciuZ04pEao2i/j2Vs4E
+-> ssh-rsa pO5rrg
+hdO6FkD9Yeqanl0UDitgurFbc0wLdrSW7hzhVZZDLytpFqa/t7rfbw4fApDk40Rh
+nLXY3lyODQXbQhQs1Em7vOCe8GB+GbavMyVYhjfi/BCuSJMgJGK8/UzR9HeN1YbZ
+wrgBTY+UytJ8bXDE1LfQkHlNKTpP/yjcUzqbNsm545Gq8OngPG2ifeekAbjZcbU+
+tQu9OZtlSPyY4iHUyjRxQwJ62tnCHbYRjo/in4okRzvOndGgp7/lfKh4f3LghGfn
+6DDhiXJH+6rSbKkiNYmsYMN+mMkbkxjdHykNQbFti3QPQfeLcn1XSXufZs5ssinD
+jX5wsenyRa//n56AGRqcZg
+-> ssh-ed25519 dgBsjw sRm5Ez3e60xHRB15zWQpEA2lWrb2AODW/mMWOnVdZxY
+eZISu6W98T2K3YJKboDDqyXFDExYJH7X2aGSSrqjMSo
+--- PNoaSG+EcEWYTe132jgDp1tzheVJ4CoTO1JadJNl+ys
+�y�3�
�M��3��W4AH���M;����U����[�o����-<o>�Jc��f;PV��
\ No newline at end of file
diff --git a/secrets/wiki-smtp-password.age b/secrets/wiki-smtp-password.age
index fd598eab..c6a97507 100644
--- a/secrets/wiki-smtp-password.age
+++ b/secrets/wiki-smtp-password.age
@@ -1,17 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A EvnCvH6ER6Pied87i9okxBLCx38fNP1fX3wMziJ5PXI
-b7vN/9pxRWuUrug/bkZIZD+2wSplAGLK+ayO+YYDlCs
--> ssh-ed25519 BAs8QA I7dMk+pvKe/bNkIr98muyaOKqTdBitIdrRr5bVN3+DA
-5D5IGeF6rqF+HNSdDZE/gj0DPHISR3Tzj3Fystm++04
--> ssh-ed25519 ofQnlg 3XMrmWBHw6+xfYIn8fZ44ryp1dHS7qVTK0cTJZGjXV0
-PxuU0/w27wW/335mteby+kNTr83K6SrjvNEsxBFHOEI
--> ssh-ed25519 COspvA 5yfMt71p+fx9aIT8ubgsHZa9XEJE6trsOOqgC0VxxBY
-dEIuIERcnw6dFb7IMmdzM5b4ySmdg7qtR50X5gQTd+8
--> ssh-ed25519 2XrTgw ZpXWuF2jRWpxlK9HuYZoZyN144cvaNZubVuLBUEq5kc
-692sos5focQy0TnUfvz+cLktK2a6tyNS8AWbuDgb4/c
--> ssh-ed25519 awJeHA ZXx69b4ZvWbwtwnSFjK031mIpK8lDN1nwxq0N+FgREY
-f7GrJm2N908qtPEYY8T22JGhfWHXbUTAdRuEFHGLOKo
--> ssh-ed25519 dgBsjw mD/FfN+J2djG/3hR98oPHznAhTyVz5Z8jnJNlQXzWSo
-KULWl9PeO3qwbUNQJix/Zr07l9lsBhPZTR6aeOiyx0M
---- EUYAk4OeiL39nwZ7YIlLucUMfBghaegrtgqH+sOUEfI
--Ȑ6Q���7ᷙB+�p��e���({<�8�My|��]��k�h:��
Z���de#����>3���K��b������q^uG
\ No newline at end of file
+-> ssh-ed25519 Jpc21A 0hWJNdYeZFhEnJcFiD1W5krZxVEtWaAD4ZKJyxBIdBE
+4eG7o98vK4xbDEy0CsUmZEzHMzK4mgzDUzzV/AobDWU
+-> ssh-ed25519 BAs8QA W/o3cy32vI+BFCILY9xjay2t7f7uAxh06AvfUzMaeFE
+XbAbxRz0ZoswQgKPjLx2QVRvrw9kyriV3VzivfdoQfs
+-> ssh-ed25519 ofQnlg d+XF0AW3mOO6dKhft64qWMHQabJPf7SDMPJFel7OhxU
+T69zZPCqGQcqmYAhPbfSTlILKAvyidpiMXdkFNga2cQ
+-> ssh-ed25519 COspvA J+xJTOeqSnDCNOVju0o3HzERXzdBofSXcPwx2gqLn3E
+NPwlFYqSQIR4rHjtU2Hq3Tow46qdOsV1SKY4kDUeTDc
+-> ssh-ed25519 2XrTgw Hrj6eUq9vi8Uvr3tdLuuVVhzfwPinG9q/css1S/WAUs
+4ZLxMRHPUM0x9+427Q7yWdfUmW6hnWc8dTk0hFpUUP0
+-> ssh-ed25519 awJeHA HRYlq6QYcUaCqc/ekwT8ILSvrHLKps1oGT4UfRyV9ik
+1VHocNj2v/yGzJ/049xhsN9lm0Lxil51UZAffENpInU
+-> ssh-rsa pO5rrg
+QXeBCrTcTy67vTQC7L8tYh5Jv7cQ+M2USX6RS0RhNjDEtlBKRTtt9PXWZq6bDH/H
+CphGI3xIHH+iu5vP/oL7fSsT6AEnutIbtMqBJV9/8DR2NrAfFhiLbA3Id44EluSx
+FB1pcV8P0EqII8+Cd1HR2A6VqUxjZzhg9xssElWbDcece9dthmu1LscmIOp1hbhg
+4GCvVnvxjaMEVN34D9qXRAwG7w4m/VuvdlfYL46otUdM6zhQkH+mKxT0TTLTy62O
+rJY1YeeGYHErAlbqDJf0I+VEoj+6saxAZR/W6cXkFAXd4556TpQS47L2bWRSwoPq
+dGCALCedU3zVPb9ovT638A
+-> ssh-ed25519 dgBsjw qKBEKoxuHqVsyxGpm6Ke01LP1X1mST5vgDQJYftjchQ
+15UKAQ01eG80B11+pG/mb8SlfEo5qImeaivOih2zu9c
+--- KwCQlD9c1srN1usEKZIQr2THHOku0KzN3BLT6iqlUkU
+�ڕ�#�p�n���@�쳀��z

R�j���d���H͖u #���&6�NPygA�>�U.<fϣZQ���D��ڤET�k~9��0
\ No newline at end of file