From a346131bb5ee2772e308aa2e93fe7f0b03ddd0b4 Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish@lakhwara.com>
Date: Tue, 10 Jan 2023 21:05:23 +1000
Subject: [PATCH] rekeying secrets

---
 secrets/borg-password.age           |  24 +++++++++++++++---------
 secrets/box-wg.age                  | Bin 316 -> 286 bytes
 secrets/fastmail.age                |  21 +++++++++++----------
 secrets/mossnet.age                 |  22 ++++++++++------------
 secrets/secrets.nix                 |   6 +++---
 secrets/wallabag-password.age       |  13 +++++++------
 secrets/wallabag-secret.age         |  13 ++++++-------
 secrets/woodpecker-agent-secret.age | Bin 451 -> 527 bytes
 8 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/secrets/borg-password.age b/secrets/borg-password.age
index 063b3a1..cfae9e9 100644
--- a/secrets/borg-password.age
+++ b/secrets/borg-password.age
@@ -1,10 +1,16 @@
 age-encryption.org/v1
--> ssh-ed25519 0Digeg sf6A7T1vNdQI27x749LUyu07j9PKgivnbgxjhqLmBiM
-I1ySXLwhqwClGSh4ZWmbLK0tPr5fovl1YjVPCQiIf6U
--> ssh-ed25519 K2vF/Q f88+dZt/sruscisjltU2TSJbR/6v4ro3zUfoQ4gI3FI
-yaQ8YpDNcDEw0CNhXKs8ZCKVPiXelswWqCDUkV4NU0I
--> QU-grease "ea ~|PB
-72Lti9QIxVeIaJBCu/t8gYZoFvzY6Q6iO2Oqs7y0IdwCCtrYvylNvl6eUaUpGDk1
-17RC5vJHqfylzL0lolGotfl14jaX3UfH
---- JwBRTcj8xHmiYRgjbwDSL1SLm5SCIGx5lCKl6Lf7xns
-e�}'�$w�D�hA�w䳭��7�PR�i?i,�1��ƾ��@o�-������&SG���,����DL�3S���##�lH��"�a���ڣ,�9af'i�]	���mLcî��E/���D3�Ymh
\ No newline at end of file
+-> ssh-ed25519 H6uv4Q 3asdg9VypLPurkpkZS+QWrJgKblocFYnLYYt/2YaCEk
+DipUROl6NGPhsJUzKPQOeLyEjcaETezj4LDVaz2EFiI
+-> ssh-ed25519 K2vF/Q DH7iuWietGAaNbI3qqq3ZaDPyZSzdIQeyLieBsqi3UA
+QPxkCx4a/OAz+AbBM3hlsyZScSRKJJ1CD7UKzw/ul/U
+-> ssh-ed25519 ntXL8g j/lr/ZTT/8NiNiwyUVmGyyoqhFg9P0madtgFaJ/dy1A
+7aaZ5lWpCq4fFDRtiI3zxa8S/W02MhJOdHphgOBbut0
+-> ssh-ed25519 kgCrKA xBbL5VAEWXQ9F7V7u6fUgLl61kHqFblpbETmqmfEMhI
+0/PLukVNlxpyvDT97jsSRfqKt6w48NRLkU1f+/UyJF4
+-> 3w-grease Kb0`%Y +T?-DRS
+M+8umd13onG20+P35skjhu/cwxosXvOQ+0sceD7ZeLsBbVvpdqq+rsyrhn/mbCqu
+8HhXckoF5E8pToYWEqBrAVMZU2tMFy5GXesmYrZCMS2hZ/15I7tWxaDyOy0hcIO/
+
+--- d3Y+JHs1npUKS65ZF4eXcSLzUisdsepUtuXAdTDrig4
+
+:X%���L{�I(���2ޡ^���Ƚ�"�����j}�t�>5r!�k��=��K������n-�d�z!�2�K�>�}�1�hi�%�IIU��fҷ�7�
�WA�{��D�A��->�>�*�bl:�h�
\ No newline at end of file
diff --git a/secrets/box-wg.age b/secrets/box-wg.age
index 73e3c6cff0e5aa664376dde800dae8a591c0ae92..20e24899ee8143f3fc109000129c910c42a9dd27 100644
GIT binary patch
delta 250
zcmdnPG>>V5PQANnsIhB~fsdDGl6j<KS!!;Yfw^T!U{Q*1m43RjwohP`o40{~V6nH6
z1(#n|xlfXFPHK@!QF&NmkgtDLc~MDfWPodSkV|%eV?{tnxSxrqc6o@S1(&X!f@+d(
zdQoa(ajHU{mxY3E9+#U*QocuNx;B@tuC79)v%arWZgE~nMXEu8nR!^KeoA^tfnlj}
zK!#IFfKgazc}SV1dtzo;zPSaLceN*D(Yft2?#+s{36zNW$FWAgA-=Kn-oE9cCVRi1
z4qv6ibHwM-!$VI}=5;k}<XjfMXa>v5#w3XemxTV*x86A6d8#O}_m*_V%h#b|ya3BV
BT@3&L

delta 281
zcmbQow1;VePJODIagJAoe`$(WX1G(1hj&<(Z+3dJOKPZou~V2&fSG5gw|0r4Q>wdL
zF_&?9v8%74Nr8JxiC4ODRiR-}qKA97YnEkxYN2*fsb5i=e{o=<d47RKD3`9Cf_Hj;
zm9B|ydQoa(ajJr=qJu(wp@L3OVufu!S4D(za)n8bWxYpecuJ9@k6A&EWvZWfqP|;M
zK9{bpu0n`Om}yX8uxUw>Pl}Uev8%a-X_=8@fT@3$VR~^`kx{NoPHAd^hl`7)D_6C<
z?4MsNS1vfyT_DfXJ2|UeRAf=*g<1c92b<(`{#$m&QKu!rv&}x7Vd4Mz`D%NW=OlY>
g+nReTxAU=?(8o8bYXvPk-puKXO5G$8_;trr0P|dDfB*mh

diff --git a/secrets/fastmail.age b/secrets/fastmail.age
index 25109b8..414f95d 100644
--- a/secrets/fastmail.age
+++ b/secrets/fastmail.age
@@ -1,11 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 0Digeg O0ovDrbvyAZQLzEN+Ffu8vSnZ10ybk3L5VTlEgbVsX0
-qZRlzsLLLAH6tz/yr2Dgni/8HN+RMr1n7oX3fIrmvOg
--> ssh-ed25519 iQshAw I91WonqdGOAadVr8omsBwviShi8zuWmsGWTCX/x8v3U
-RbEz98zKkaMWgyAN/77rtHuoHIftaZ0XUvoZZdkJo78
--> ssh-ed25519 K2vF/Q y2V+b7fWeqrUrQUsk8D7JhgXCGY/sZN1UGSh9DW85GM
-xDznJutB6h6+86qlofrVHKP8tORDEFWo3lfOu8bpOcg
--> 1"=Lr]-grease `IP
-TPx07pXUuuiYDjXZ2PK7xazR0ak0QYiMfT62Xl2ogxE
---- tFV9DMF9b0NQuH4GnkVQjfJyFkrv2sEYxHbdFRXAffo
-��V����g�1��i��~�-��9�Fo�b��n�;�<A,����d'	4Ck
\ No newline at end of file
+-> ssh-ed25519 H6uv4Q Qf7s6pK0PBq+Zv1nv7qbYm9Qm+0P39eqR362w1o8nxc
+YOk8m80JVFMKz+ey857T4Qo7Vx9NKeiu6V4a3mZ76e0
+-> ssh-ed25519 AiezdQ s3E2eY4N4deWve/9WR537ZS85TU283zV9IXIxkyJqnw
+RA7q2TK7XPXAeNW4HUQzxINlsNlI8egI0GnM/6aVnLE
+-> ssh-ed25519 K2vF/Q b7bnTDRJwBa9yhmrhKKBYNUyQ1UNfXRK85LfGd4Lglw
+E60ptHJoQA5teXWxNUUKEgi0nQGIKHAYs3fedE473ZA
+-> 0O-grease r*AG` mE]\n%ZG
+I+8UtH+eqmU1Rm2KESrat7WNH6fPJ7WFQPahwc9AyGs
+--- qdDWMNU50UncD/9mkA/BEvYlSK5Wb2du3WzUmtwHASg
+ǁ|���?�U�WG�s
+�9�?��Vv.��A���+�GL1��Gϋ��
\ No newline at end of file
diff --git a/secrets/mossnet.age b/secrets/mossnet.age
index 19749bf..f02a9ab 100644
--- a/secrets/mossnet.age
+++ b/secrets/mossnet.age
@@ -1,13 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 0Digeg ZQzCWwDhJCHhNRz4y4yCqu4tZZXorxdDPWiVtSFDARA
-/NiiGTMyDVHrJua4q7CFL5c2hdw2h4tNp8LLEzrVoNc
--> ssh-ed25519 iQshAw BEv7B5rqtpomNNBw72vvfGWeHxY5AFr79PMJGAwEl3U
-hbyQNDX3ocyhBC9VhF9sTFbcXlxrUh80sUBEsBsUn9c
--> ssh-ed25519 K2vF/Q 8XHw/cFjgHa8ZrqzrApMO84tdkehGvEbImN8U/ETKmg
-iVjXArB+xxtLsGOxgfca4Yu/W8KEhX75aFs34gX0wFk
--> 3&l;-grease r]z }>X&Q GZ
-IZWwFYxy1yHObS1/Jp6y78oW6Fa4pZk/ElNKhdq1G+5pPP4GTbfW91rKYBE1BMrH
-yES9CXTbtV9U31dCmWXK4bI
---- 8s8k7o1B6hJkUeIxqLyGpLivmFq0i2iUsrEYPrqYvAk
-�[�ס��<�4}��.+pp��R�i@QI�0aI��
-pGvԖ`���
\ No newline at end of file
+-> ssh-ed25519 H6uv4Q jMWm+8r3DyTFpf3jXuNKkti110gRqbWAIgDOhejnOgo
+Ygu3pXE1+w0XexGZRAKtYkSELzXtWAHdhfRbnTPRgCE
+-> ssh-ed25519 AiezdQ jv1oMHRq3v6do2jr4KVkQC1K3zm2ETs5rEDCJfFYuyo
+DVK0HOCJS25Quz/X2T+BxxOFvFg+fMbhz0ZO6SRaxWc
+-> ssh-ed25519 K2vF/Q egqpPh4ePNes8ttE/3UGo9/wvWAU00KTY23i2LaHPX4
+jQgWG9iFyMZsdoT9TJ9RcD8OMt69QwjOpQPv0My4iPY
+-> ZfV-grease Y6 db&b:a+ ,pq>
+H7UqUN+kDx9ItjWlS0COuKrsiOY
+--- H/aZeX0H5skzACjrRkw3XwhNqXMcFAox2QHfKXrYNpo
+��� ��.?�	�'W1�)����j�ݱ@�4��c�������Jg��]
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 414c1a6..e91dd99 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,18 +1,18 @@
 let
   # set ssh public keys here for your system and user
   user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIItTdCyYVur6LzRQf08JZUcEAr23H7fTRRmDJOzoOc6A anish@curve";
-  system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMPcqWQ/L5nLTsBFHArl3AJb9xynhfsKenb5h0NNuMV root@curve";
+  system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4kI2giQrA/VgM/Ao4T+f7npcJ//acKZ5yY+eUuVzbB root@curve";
   mossnet = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA0bsVbdQR6iWNLKIiID57A1+dVXC58Dtf5cSXg6/JF root@box";
   lituus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2lAb33LH3JNuOfBXt971u0tHe+NURFecQdfjwEj+C+ root@lituus";
   helix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAKrL6IDHNnHmxi0q9nzu87NOyidPm3HpE7klU368lEf root@helix";
   curve = [ system user ];
   allUserKeys = [ system user mossnet ];
-  systemOnly = [ system mossnet ]; # lituus
+  systemOnly = [ system mossnet lituus helix ]; 
 in
 {
   "fastmail.age".publicKeys = allUserKeys;
   "mossnet.age".publicKeys = allUserKeys;
-  "curve-wg.age".publicKeys = curve;
+  # "curve-wg.age".publicKeys = curve;
   "box-wg.age".publicKeys = [ mossnet ];
   "wallabag-password.age".publicKeys = [ mossnet ];
   "wallabag-secret.age".publicKeys = [ mossnet ];
diff --git a/secrets/wallabag-password.age b/secrets/wallabag-password.age
index 4f8928a..a9961c7 100644
--- a/secrets/wallabag-password.age
+++ b/secrets/wallabag-password.age
@@ -1,7 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 K2vF/Q 71YyNzHijmSYXrZM9XCpTuz+5pp5xelrfrsDALqEqWg
-hukblsPnp+yj9O5y3YU4NT2PLxp0WGtsEuOZlxx06OI
--> J#cy5AG-grease 9'>
-YNU2IHnG1ELEEKThpSVN357BDExcNcV5npG7P/J0/jBJYofo47p3
---- L807Hrt3wcqdJI7s9VOWIvJ4MsFcoylXUBMiMwIrJb8
-j��j`���P�;�-$
����r�p�L�A�j�El�{��H{�
\ No newline at end of file
+-> ssh-ed25519 K2vF/Q Gtbp27DILktCJ1AOZPw/i8Nm5b4/+V7xhPiMGODzp0g
+7K5MyDZb6eS0YEJGbVCIlhEgZGk49qSYLnzx5JjxQoo
+-> HI1$C-grease a;J@j? hm 4[@bv%?
+iaQ
+--- Tt+7FYng4n/xtrjAkZq5WEvARAx242dDKpoRG9s7rvw
+�mi���
+����	���hD�����'.�+ :g�
�=�
\ No newline at end of file
diff --git a/secrets/wallabag-secret.age b/secrets/wallabag-secret.age
index a6aec46..c38f5a0 100644
--- a/secrets/wallabag-secret.age
+++ b/secrets/wallabag-secret.age
@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 K2vF/Q rJ+Bv933siTbr1bFbjS8yZFAJNJVFHGSaTRKL5voKEY
-XLVaUEDtOSHciozDfqVc6tpYi1tGpu9p+lR6lv5R1Pc
--> <$ra')-grease
-d6H6lDsqhGnmRjyAJzzpcb1z4azaZ0CSzS24o1OMDt+wo+PIp5bQ/xgsD2HEOveB
-n2A/GSyDv3Bv
---- jWBWzIifCy4DUMo18Oi/HflStwhxABHgrx1LsAdryFE
-^KQZ��9��B�O�щp��#�JL��Z��	%?Q�\��i��f�b���˸_�4��z'��P
\ No newline at end of file
+-> ssh-ed25519 K2vF/Q kQ28fVmXgtlAHxucr/6iPC9V9XzkpNMUnZ8rHkqmvXE
+ayk0SzMZQceEyPZK0PDXxfCoP/dfQVkx+S1D91Gh6Y0
+-> M7-grease abO4<w/ |/Wb; 7T4]Q$4|
+EL45n6ML
+--- q+8T2/U2d6Ru4QkhM0EZ9VENcUTglSkFsVqpqCDT5Uo
+��v�dӆB����ɎD|r�����ٍA�O��m����|-�ŶM�,R�$1��"fw������
\ No newline at end of file
diff --git a/secrets/woodpecker-agent-secret.age b/secrets/woodpecker-agent-secret.age
index 0fb9086f61d0d078d59e56acbe81cf9c5b1570b9..bce3ac9a58390af83d0e2c09642757b14fb0539a 100644
GIT binary patch
delta 493
zcmX@i+|M#Wr#{2nEVA6(Bg{BI*`P8qKhM`a-6bcmJkYVC%qce|$s{z*+&MYbGdV9P
zpR3FxBqh%%!q+>(+c+!FxXRSfqRKoyLf<LeEW9wvC#|?B(J9-~rNXT=luOr6p}06h
zH#Nn`)YQ;YAv@i<$lFmNHK-yZq^j6ERX;y4DI~|cq~6jwILIqEI4?Lez@Q*4q$)fl
zDkmb?Eh{^jD=06xIKZ;PO*^tG!m-@M-L%vvD=oC#z_%dLIoT}K!cgBYG|I;_(%&r`
zWSyn8l9r;blWuxZYGQG!LbyhZb(mRdB3D^<Nls2gkdr}pL8`X4p+QweQDI&|wuNVf
zL1J!wv1_4mxN}idM!sQ~Ww5t@Ql3*@S$SYdNur@spixMum!Bh-WnflrR(MurNJ(0L
ziH}8MT9BEWrF&^+vXOCaKuB0wVUcCNQE0i5cbQ30M0tUErh#W>R+b5uuCA^^nRZaR
zPfCiBc6wq)M7ptedZ?dqnxltVfJaVvN=RjztEWqNuzOCCaZyw#S7sFR<-C;)>PAXB
zq5^HLDjjVt%Pz;e>amJO6->AOSk`~7^6JL&xP-S%_N_5uJbrEryWiesdY%~|pez(t
i$`RW=JL~`YIID-|nWc({a~3c3e!lik@8yZpCISG&wyKQ)

delta 417
zcmeBYIm|pkr#?8+G27L(tja90FuN+lqDVU=y)3UhEzr-)xWK2vJv2Eo*TdV`CDAX#
zmn*T-(>co1z_}#1+|aSaGblAPqQcZWA~d+lqA;o?J18o!!ZOt_*r3WVolDnFp}06h
zH#Nn`)YQ;YAv@i<$lFoDGt<DJAk8DvKgq)@$;qoKvpy`)Cp5^!xY*3F#K6lxB*Y*x
z%FEI}vC!3k%P-U`C8Z?QqRKNWqbRH-I5i~HGPBS!G~CkE)X^`;(ab9<*TOe2O*_B>
zWL;p9Yh|=<dQoa(ajHUPu)0EQk(EM#XGKD}Rj@Z#X`+**Q%Y7!nsIQYX_}8=VW3}e
zT4YpxM!s{9yQ!gXfJ<7rxv3+UuCA_vMOLOuc4<LYUWIQ?a9Tu}SD?GMNkN#KOGs&<
zUs7?IhkJ3MPnC;DR-ge_>YR}27V`_{CT!yT@z8zU(&LRK+h2U|HfjF!`QrNR$Bm+T
z=IS>oXs6wMR*@vOD8%!{)t`A!&(HlOIZ1h2&@OH%(~ZAE-v0S$$@%of6BFAr0+A<E
MIF`jEzPaKF09(A8>;M1&

-- 
2.51.2