fix(ssh keys): fix secret decryption on agb01

machines/agb01/secrets/secrets.nix

@@ -2,8 +2,8 @@ let
   lib = (import <nixpkgs> {}).lib;
   readPubkeys = user:
     builtins.filter (k: k != "") (lib.splitString "\n"
-      (builtins.readFile (../../../shared/pubkeys + "/${user}.keys")));
+      (builtins.readFile (../../../pubkeys + "/${user}.keys")));
 in {
-  "wg.age".publicKeys = (readPubkeys "maurice") ++ (readPubkeys "bakham");
+  "wg.age".publicKeys = (readPubkeys "catvayor") ++ (readPubkeys "sinavir") ++ (readPubkeys "agb01");
 
 }

machines/agb01/secrets/wg.age

@@ -1,10 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 JGx7Ng HtaAERSKhcnVlwgXFSeoBxgvyMD6LLS2FS2hVJHj5GE
+-> ssh-ed25519 5rrg4g Q11014nLdGOukZJV5enI4qoAqDrysWAxYtRN7VTSnTA
-++aPZYrVrMRKkMqhTAdTXRuJ0gDTxTaF7lw3ETB3jkA
+oEK2C8A28KrNh4WNcGGQNB9/3ADNHgGxTzOegL49TT8
--> ssh-ed25519 Ih+Lhw J4sYJKFXL8GY2EfpJLvDecXSjEM9OUv2v0GROxUMGXM
+-> ssh-ed25519 JGx7Ng NH6IB+2tB8fyvE81GF7p8SflY7HH2R3uvx9xC/5HFyQ
-vsJCO+hWC7s/0fFPkIcZxsT6dhuVqalRNtCe5BkX3+U
+4x0x1L0wv6+k04ESLIy+qY/RhVCWtOeyETo1FkAK+8A
--> ssh-ed25519 wS9Cng 1t3BDvGC5asaG6fZnNuxxuYKm3EKOPGDmFwRA5okiD8
+-> ssh-ed25519 kXobKQ 7J0f+l8+/mNQ7q8nW0jcg2LqGDARN1K63IJttdQ7JQw
-ABEvfYlQB1LJjQl6XJ40sqEgdnrrCHci+c09UUbCfCk
+SfFDS4HgjYkp+vGmCwy0c5GIqqWcc4m7mRVQmcsW/pM
---- 6/mVEZIYh6VgkIdgMAFwBdFcTBiiahJI5kShcVuXOCc
+-> ssh-ed25519 OZDL4Q M3Lztf8lPH4G7a+QPMY32u3UyhcHMoC08ZRV5UE6Gmo
-<EFBFBD>ųñʬ˜–`Gwá;Ö}tm“ï‹}~‡^h£A‰0<E280B0>|ü2¸žµjX^ªü¢§Ãµj
+Kc7116r+3+xa2qRSe22lctbTd/a133tVZzLkWt0XI6k
-·øõ.€t‘LÛN?“§î9?ëný^½SH>
+--- lsOrVi/OJ6AxtmEbB67VKvlFlDnt+sdv1TucqWqGk2w
+‚õnDÜg4ܲ¯*ßM<C39F>!ÙY¿™‘hA<68>š6‡IÝbFgö{3¢*7d¤¤¦A¬:¼×Ȫ á“±½}ÀˆÝ+lu·¨9Þê

machines/hackens-org/secrets/django-gestiohackens.age

@@ -1,28 +1,31 @@
 age-encryption.org/v1
--> ssh-ed25519 JGx7Ng bMdvEX7j6bw5GNBohOahx43feq2/5/j/sm4+gLBCqls
+-> ssh-ed25519 JGx7Ng WteJXpTnBzKZpognUrmY7vJkwvgxG2JlqPOkJ1BnoU0
-SJAb40fN72h2/e6TFxKyF270xGtBq5EICpQB7Oe6KnU
+Hn44BN9Sb0BhgWBDZR7Xm4AAeRY2LE7ILgtBi8D/QTA
--> ssh-ed25519 kXobKQ P1Ve/+t8nPrzu0qBL0EVnVH8X8f7/O93pH5ImPGnfVU
+-> ssh-ed25519 kXobKQ H0VlX0C2BfZWzA+c7tGaokBTGR855cTlE2qlZkKyZXg
-cG2dTLsKuY0mJhApuRw4ShlcpjPHfbobN+wxnpW42qE
+9cTALIMwuoLyfjQ6AwzM+DWE1jLmxzoKuQ0NsGud+Ik
--> ssh-ed25519 7hZk0g 7cPMy1bOSScXdk5xUiBrWM1noZ7QA9td+ffAlJGuKDg
+-> ssh-ed25519 7hZk0g XYW9TFHZ2ule9rmiOeTGPLEGEEhkTGvV946UwV1XVwQ
-2GrbxwLERVZgMAsAxhxVkEt2dAwv3lK2tmi+feDi9Bw
+eOlzfpFFROTb2zni2A0cKwmnjvaUsZpSvDqW8E9mMZg
 -> ssh-rsa krWCLQ
-raDB1S2KgNXYYjYQoReSNbsMPBt8qUerW2I5Tiewco5Ao/iGuQPfaMxtuHPvk82r
+1JcEgjO1//IKYtTSj6bwhjudrpcYuaHAa62lhIL0m6ScSaMcZhGIy8SWU+LvlgM4
-VIpznCS6ZyEFkyFKCC/rnzgeTmH8LDAuGPSjCFOicq7STjhVqgjdaERkw4s6UxRN
+eGYvzinsVhxCAgSJnD81yKSOjU0U+BoY1egx6DTAD59YR+IJ299yM1kjqjJhP3lc
-WTQVhuVpRaN8abdxMknQG+1WpkdmlOQG6n+B7JN/Z5AgM4kE891CH+WJcaPetDwO
+fomOiDbr7mz0UoD2/Pe1Q2ps49rYkVH+ms7Dt9jKyYh7TwsyWitsvHEoXHjhG/u3
-/wC6+Na3EkgJS2XrK++IveWGmRRy+CZdRNe/NzxNCV2wp+w1BJohHttq7gRc2F7z
+PjLCVe3ngJtPagl42g3otOpmiZ1ycx/HP9ppJvQYoH6VUt9x9nPjUqtUQf66jwSn
-58r6GzViXSAZ39QfKMO5e1MrkZHfzshc74jpkMnLWK9QXWsbTbkYJzeYf7wWCm9F
+87lfDXpGoyPO/pKX+IR45zGE4mVHfYsGzfNJMHyE2AImqxfAoZxqmRdQiQLCVihy
-STRR5xQJIZdOEYKNsIfb6Q
+4xuHqWeuHN+Q6KAvhlnhRA
--> ssh-ed25519 /vwQcQ gYKVPzT6ZXSc9xfuulV/57pIM1NXJ9IlLF/kJMRMWGw
+-> ssh-ed25519 /vwQcQ ShQtj+r8CjS6zB2T4IYps21Wt8psIzrrff9NmibGQRI
-4FiYaBIoC1hmYayoWUfomIHg2ibtHsBtyYMzMs8OcSA
+dGBMjJfL11Asv+w5FrTJo1iknZZQNekcxoaLxmzAJAI
--> ssh-ed25519 0R97PA GKMaGC4HmLhIL3pNEqiYqZ8a04CYgKt13IcRsJwQ2l8
+-> ssh-ed25519 0R97PA hhRQZ7ddcQtQfwLHADUz6LI3lofzMxNfsLBSsN+keUA
-/8ePse2mnztxXGJrDLpr1yUcnyrm9AUQgUWV4fUcmXk
+sMKxjsYj+f75tMsM6d4dqLgTozzRcCzZQf9rgjRi4Wk
--> ssh-ed25519 cvTB5g CBw8+xqz9S9S5t7/TY7oz21WdhIqtWNv0WAbU16bayk
+-> ssh-ed25519 5rrg4g OETtCVypHjgLnenHGL6inIhhestIUEF0LVfJVu6HBSY
-cUmHOQsoyaXkWVwYK9fK+CoAvYtDGcYF+JV3GgxzPYI
+4GWYGsrHaCQURF6ffwN67Sz0DSwBWJ+cBn4WsA9+bm4
--> ssh-ed25519 Wu8JLQ VRDbadjqSTsmF/gkFe/Fg9OcxOFJDur0NJhexgObJy0
+-> ssh-ed25519 cvTB5g 5QS4yEkwZDcRKx5w9ip/XW2RUKuDoR9hjT2rITG9bj0
-C1/W8PbucQUpYfVomvK0S/JIrHOcdGfpmru7hbvLdGY
+a6uP4DJZuOEy5wFnCoM1pUd5p1ySSNXBd8WINORz314
--> ssh-ed25519 EIt1vA SlgOWnU5N7XUX/tpp2cOH+7d1fl6qjy5R4D8lyTr004
+-> ssh-ed25519 Wu8JLQ 4/ETnzSAyvb1rm30ZXxBvWrCVvYzmvEjjai4W+nfEmU
-UBNV6PrfOB1jRV+GATefjpv1KEGyP06cKD741xzS8Gc
+8YpBxgtgNASRGABkPIWV19iQdcK5OI2toSefifCJi6A
--> ssh-ed25519 X51wxg h1LfGf2RiFSAaUbLjAivqkX/f0rvxAO905NUYCrX7gk
+-> ssh-ed25519 EIt1vA pKBHFdt17ruSWarLGRMv9Jg5p4owmb05Chqi1waUlEM
-ppAwL7fboGHlPptL2uQU5nBUI1FXCs6Ds3TMzG8WKxA
+21pDqeyKGbmkoHblA6LujvYNMo1DQ6u+0KjASPp88L4
---- XgL6A4y8r8g55SKB86IIv+vb3Yo3ovpH+KQURMAtwg4
+-> ssh-ed25519 X51wxg p7PTrP8g6+85BCyujUAI6h8D5dQOWV4n72Cu2wQzBls
-"Ú<> b.äcb¾Er<45>÷¹š·{»¦Öl(Ó§PßÄ2…e#ùòõ”3¾<33>ÏC‡P¹…	|á˜I0ÔÜ¥S@ʪëQ¸ÝYæ'5…<35>µ
+X9Sz+dmsnWfVn7RfdQoNdK9ifDKuyqa4QnIz+OfK1xY
+--- JD+a9OJUT/rKwLe2m4naby7JV5VE/d4fDaeg2Edyl5I
+]=Ë
+<EFBFBD>ÄÓÝ»÷â<C3B7>8L’tømrœ]e-\Q=:¿óYx×:Ÿ6—ÕÚýNôäî‘ÉnIÓï©<C3AF>dc<64>€0YË0¥ŒC ]MôD—

machines/hackens-org/secrets/django.age

@@ -1,28 +1,30 @@
 age-encryption.org/v1
--> ssh-ed25519 JGx7Ng eP+ESYHBywDai4xBqYPvBvTyim3UGJ7wr4P8X4ba7UE
+-> ssh-ed25519 JGx7Ng eXYZhPOAu5XuLnLyVZEWG0yGReNd1NrYoZaYWk03rAw
-QxAZQDfWP0wATQSovLViFVOlA9OS7MXG8QkK3fLh1gs
+rMmxeUr95ruA24E5rchZ7dWCaJOerRmulpjwbAtqqCA
--> ssh-ed25519 kXobKQ J6L8DDpQBMDtNyYB93QRAvihFxLRqT4LmMpejMDOviY
+-> ssh-ed25519 kXobKQ rJXA+IoLwVLV/EUlDBQztg1jDIj36u5k7C0wDEfR+UQ
-6C3myA6TyAVE2qi3X3VDgcmCAYEz+fmFKD3iZXhRbCc
+2vWEQ52uMZ+cQvXIdMelvgzeUZ/8bENDJCQDHDuKLaU
--> ssh-ed25519 7hZk0g 4FThmeWrL/ZjQ0d4ZiEWNloWCQKiQzceG5zC1qFSpVw
+-> ssh-ed25519 7hZk0g O9G401J2twPY8gB6uYTLkpDSMQRZB3ScmlS91WzWfjU
-Hr8sF1BZ/EhBc2q4HiAxX/UsUNE69o3M07bKtm+sgXQ
+7piYGZj0UbyS+KnSVfZthI3HfaNcc0eadRAORtyTd0o
 -> ssh-rsa krWCLQ
-y4Bh1scvxuDLaQ7rgmKr3nQwPv/8809YVU6M2vFNnkaxn34PRlnVr0Od4yzGGwHQ
+bFQHI2oqIXEor7qbt4QJfPC0q4PanQ3lUp/sNJbsA54OZAW5b6yC2HOeYjbv1KQZ
-gwi6D6XUKrV2Eb7MUHuIPEktoH8m3T3W9NumIjKa6xeG6kOEvB7lqeZogD1oZHBm
+JdOeKZEruUlxPkNBEUpvz777THUnwlTHNxRxO//mDyHGU9PwgyIQS0aMf4Vkpfn7
-5QgqiAqK+AWfWInYJIaBiLvlq2j9r7MKAktGxcSHRy3U0/50sJR+0NPlhfMtzD8F
+OZMJrCmyYh1Hx2olnJjioMC0H3hBeuAbm4hJYu1EEfhCzhyNc8jbgn8s0VTWBeDo
-2l92Ygd9IrbjzmWlTbD9NVHsYUSrQYgmZDoPiMfu0DQ2u38c3KO8X8VWMhXNag05
+w8+Nxo3/IOimSI2qaZGBFl/3yE73KfuiYw68vRYkrPWGviDeyCEBJpYcmBsiu81s
-+NozK1JJjtjpCMJ3x2LVPffpc26Ae+SemDswz8YzL7ty+q1OhITjmteghIAS5OC6
+e0mTkZdMBMwVwceaYakDc7fK8ij9s3fpKXvJ4EJ2qqUG6ThsHN4eHNNRbau10Zvs
-DMzWtxYdYlV+tkHtleRxSQ
+YNKk3d6TpoyPl37eqy9i5w
--> ssh-ed25519 /vwQcQ ZPhe+5mviR2DW4v08psdcIxWVME0bXIV9Mil3RBV0wY
+-> ssh-ed25519 /vwQcQ DkKWQydhpA7Lu0NZH6VWG9Jxs8TdfpvV+eHLc8S82Xs
-ydxxFV2LNQbB+qUxErPWD0kQlww8VEy5QH/cOtNe/bs
+fvDQQntMZHrLNBxHWsR7R4hb5gnCzCVqPeHFTOrrBKg
--> ssh-ed25519 0R97PA PhhiYnOnWVlo72hfziFp+lX/WCFh4MJMt+fTbN1cCxI
+-> ssh-ed25519 0R97PA 5Z29MXm0pPIkEihLzGI/hB82keRx+OoVwgHL+pTd1m4
-pTTlibd1qJfb+sJG8oBYlDsL9ZDIQS2Dey7z/R2czzs
+l+FnUyvBzeeNT2dlbXJQQn5QNd+2za58BwPCqE1rTWw
--> ssh-ed25519 cvTB5g s28aAPLJH2t4ayKh7PqFwofXfEiTlriRc9MdOB/Cxks
+-> ssh-ed25519 5rrg4g 2uDRtM8kUl/Vhws4ibsZiw4Fo7pmgx4MyJtNjyKLTRY
-CrZuIxEjWIoiso2GBHfrQz9RzJiOwJS4MMQ9BK0EMms
+ZOuKQfrs1d4hzvwur8BCPd3BXOP0vGewpgfkUKahEU4
--> ssh-ed25519 Wu8JLQ g3LDZgXbSgi99JVqIi/qHabiTGUy78Iq7mF6d+aNs0g
+-> ssh-ed25519 cvTB5g gOS3PUBQlBWqmKIq99lT10hqEEmCKg2xlxfbWSAtxFM
-ROxjZ6YGgOESakfnG6h7GHxzYvVnBhKtZACw6phRcXA
+i63Ilu0tzXEtUlJ8jKlCW9SM+un+KePGXbaBr96rb54
--> ssh-ed25519 EIt1vA 0QQiqXBevVmvQRf9FAF4BcrOmNsXbXEoZ5u4AiviCCM
+-> ssh-ed25519 Wu8JLQ 2nRMfMlSNQVOdZGklQfgkH2jv8ECmRKML99H1iPbNys
-Q+znzyYsbL9kgME2zg+bOmEC5ph+XBEMrMKqTFp+Upc
+bLxntIPxKRBqEu+ovCU2NJklH1UEQr7miSg83Pfrskk
--> ssh-ed25519 X51wxg Do46KJNTon7jk1STJi6zpFG38X2G/ZDrVwm9hE6Xa30
+-> ssh-ed25519 EIt1vA 9MwmTDKECbLsFwQYfQaF6RlOmYdlu3iLOCFQopifuiQ
-sXh3e7iydjj4PXuqsp2NIisvLkiPlpNiM2QNoMWjQhc
+GZl2HMbgI+u6oAVFSa6zV+d3ra9QbmJcITsrMbxU/pk
---- XeNUWOX/1D64jffLb0iGmTF5kViEeQAnxOpZ7NpRjI4
+-> ssh-ed25519 X51wxg qRnN1ZKEBckkixg7wgAqDphIRULurzrd+dj8l2u6RRQ
-¬myJˆ´sF†‡…Ó‚™þs›|$h[~ÙËÄNÑž@EßsBâ³â,Á'ܬ}ò>‘KšvØøx|&<26>Ï—pº÷"Fœt©”m¹æ8¹¶Áí
+gfdYoCOppQ/ztSY9tEa8PYEbyx5rzu3Qu7Ba/OvcA78
+--- q31//bFmbqBhs9r8hy21qyVIwqSy7sYXRn1a/XIrfJc
+íËÁî†*R·ÿª–TÎR‚ÅÅ
tÄr˜ÿCóAÏ_j]DpÏnö•÷wÕJ`j‘‚ž_fýgO¹Ðö¨ÁO®<4F>XˆªŠ1¬w‹—Ì€v<>Ê

machines/hackens-org/secrets/secrets.nix

@@ -10,6 +10,7 @@ in
   "matterbridge-env.age".publicKeys =
     (readpubkeys "sinavir")
     ++ (readpubkeys "hackens-host")
+    ++ (readpubkeys "catvayor")
     ++ (readpubkeys "raito")
     ++ (readpubkeys "gdd")
     ++ (readpubkeys "backslash");
@@ -17,18 +18,21 @@ in
     (readpubkeys "sinavir")
     ++ (readpubkeys "hackens-host")
     ++ (readpubkeys "raito")
+    ++ (readpubkeys "catvayor")
     ++ (readpubkeys "gdd")
     ++ (readpubkeys "backslash");
   "django.age".publicKeys =
     (readpubkeys "sinavir")
     ++ (readpubkeys "hackens-host")
     ++ (readpubkeys "raito")
+    ++ (readpubkeys "catvayor")
     ++ (readpubkeys "gdd")
     ++ (readpubkeys "backslash");
   "django-gestiohackens.age".publicKeys =
     (readpubkeys "sinavir")
     ++ (readpubkeys "hackens-host")
     ++ (readpubkeys "raito")
+    ++ (readpubkeys "catvayor")
     ++ (readpubkeys "gdd")
     ++ (readpubkeys "backslash");
   "wg-key.age".publicKeys =
@@ -36,11 +40,13 @@ in
     ++ (readpubkeys "hackens-host")
     ++ (readpubkeys "raito")
     ++ (readpubkeys "gdd")
+    ++ (readpubkeys "catvayor")
     ++ (readpubkeys "backslash");
   "prometheus-webconf".publicKeys =
     (readpubkeys "sinavir")
     ++ (readpubkeys "hackens-host")
     ++ (readpubkeys "raito")
     ++ (readpubkeys "gdd")
+    ++ (readpubkeys "catvayor")
     ++ (readpubkeys "backslash");
 }

pubkeys/agb01.keys

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO2OaboCujXWTaLuIB6+Elrkf6IzFRJTnSZhaIhjinta