diff --git a/machines/agb01/secrets/secrets.nix b/machines/agb01/secrets/secrets.nix index c5105fe..b5b13ef 100644 --- a/machines/agb01/secrets/secrets.nix +++ b/machines/agb01/secrets/secrets.nix @@ -2,8 +2,8 @@ let lib = (import {}).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"); } diff --git a/machines/agb01/secrets/wg.age b/machines/agb01/secrets/wg.age index db4fdf6..252d78c 100644 --- a/machines/agb01/secrets/wg.age +++ b/machines/agb01/secrets/wg.age @@ -1,10 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 JGx7Ng HtaAERSKhcnVlwgXFSeoBxgvyMD6LLS2FS2hVJHj5GE -++aPZYrVrMRKkMqhTAdTXRuJ0gDTxTaF7lw3ETB3jkA --> ssh-ed25519 Ih+Lhw J4sYJKFXL8GY2EfpJLvDecXSjEM9OUv2v0GROxUMGXM -vsJCO+hWC7s/0fFPkIcZxsT6dhuVqalRNtCe5BkX3+U --> ssh-ed25519 wS9Cng 1t3BDvGC5asaG6fZnNuxxuYKm3EKOPGDmFwRA5okiD8 -ABEvfYlQB1LJjQl6XJ40sqEgdnrrCHci+c09UUbCfCk ---- 6/mVEZIYh6VgkIdgMAFwBdFcTBiiahJI5kShcVuXOCc -ųʬ`Gw;}tm}~^hA0|2jX^õj -.tLN?9?n^SH> \ No newline at end of file +-> ssh-ed25519 5rrg4g Q11014nLdGOukZJV5enI4qoAqDrysWAxYtRN7VTSnTA +oEK2C8A28KrNh4WNcGGQNB9/3ADNHgGxTzOegL49TT8 +-> ssh-ed25519 JGx7Ng NH6IB+2tB8fyvE81GF7p8SflY7HH2R3uvx9xC/5HFyQ +4x0x1L0wv6+k04ESLIy+qY/RhVCWtOeyETo1FkAK+8A +-> ssh-ed25519 kXobKQ 7J0f+l8+/mNQ7q8nW0jcg2LqGDARN1K63IJttdQ7JQw +SfFDS4HgjYkp+vGmCwy0c5GIqqWcc4m7mRVQmcsW/pM +-> ssh-ed25519 OZDL4Q M3Lztf8lPH4G7a+QPMY32u3UyhcHMoC08ZRV5UE6Gmo +Kc7116r+3+xa2qRSe22lctbTd/a133tVZzLkWt0XI6k +--- lsOrVi/OJ6AxtmEbB67VKvlFlDnt+sdv1TucqWqGk2w +nDg4ܲ*M!YhA6IbFg{3*7dA:Ȫᓱ}+lu9 \ No newline at end of file diff --git a/machines/hackens-org/secrets/django-gestiohackens.age b/machines/hackens-org/secrets/django-gestiohackens.age index 0c5e0cb..648eda5 100644 --- a/machines/hackens-org/secrets/django-gestiohackens.age +++ b/machines/hackens-org/secrets/django-gestiohackens.age @@ -1,28 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 JGx7Ng bMdvEX7j6bw5GNBohOahx43feq2/5/j/sm4+gLBCqls -SJAb40fN72h2/e6TFxKyF270xGtBq5EICpQB7Oe6KnU --> ssh-ed25519 kXobKQ P1Ve/+t8nPrzu0qBL0EVnVH8X8f7/O93pH5ImPGnfVU -cG2dTLsKuY0mJhApuRw4ShlcpjPHfbobN+wxnpW42qE --> ssh-ed25519 7hZk0g 7cPMy1bOSScXdk5xUiBrWM1noZ7QA9td+ffAlJGuKDg -2GrbxwLERVZgMAsAxhxVkEt2dAwv3lK2tmi+feDi9Bw +-> ssh-ed25519 JGx7Ng WteJXpTnBzKZpognUrmY7vJkwvgxG2JlqPOkJ1BnoU0 +Hn44BN9Sb0BhgWBDZR7Xm4AAeRY2LE7ILgtBi8D/QTA +-> ssh-ed25519 kXobKQ H0VlX0C2BfZWzA+c7tGaokBTGR855cTlE2qlZkKyZXg +9cTALIMwuoLyfjQ6AwzM+DWE1jLmxzoKuQ0NsGud+Ik +-> ssh-ed25519 7hZk0g XYW9TFHZ2ule9rmiOeTGPLEGEEhkTGvV946UwV1XVwQ +eOlzfpFFROTb2zni2A0cKwmnjvaUsZpSvDqW8E9mMZg -> ssh-rsa krWCLQ -raDB1S2KgNXYYjYQoReSNbsMPBt8qUerW2I5Tiewco5Ao/iGuQPfaMxtuHPvk82r -VIpznCS6ZyEFkyFKCC/rnzgeTmH8LDAuGPSjCFOicq7STjhVqgjdaERkw4s6UxRN -WTQVhuVpRaN8abdxMknQG+1WpkdmlOQG6n+B7JN/Z5AgM4kE891CH+WJcaPetDwO -/wC6+Na3EkgJS2XrK++IveWGmRRy+CZdRNe/NzxNCV2wp+w1BJohHttq7gRc2F7z -58r6GzViXSAZ39QfKMO5e1MrkZHfzshc74jpkMnLWK9QXWsbTbkYJzeYf7wWCm9F -STRR5xQJIZdOEYKNsIfb6Q --> ssh-ed25519 /vwQcQ gYKVPzT6ZXSc9xfuulV/57pIM1NXJ9IlLF/kJMRMWGw -4FiYaBIoC1hmYayoWUfomIHg2ibtHsBtyYMzMs8OcSA --> ssh-ed25519 0R97PA GKMaGC4HmLhIL3pNEqiYqZ8a04CYgKt13IcRsJwQ2l8 -/8ePse2mnztxXGJrDLpr1yUcnyrm9AUQgUWV4fUcmXk --> ssh-ed25519 cvTB5g CBw8+xqz9S9S5t7/TY7oz21WdhIqtWNv0WAbU16bayk -cUmHOQsoyaXkWVwYK9fK+CoAvYtDGcYF+JV3GgxzPYI --> ssh-ed25519 Wu8JLQ VRDbadjqSTsmF/gkFe/Fg9OcxOFJDur0NJhexgObJy0 -C1/W8PbucQUpYfVomvK0S/JIrHOcdGfpmru7hbvLdGY --> ssh-ed25519 EIt1vA SlgOWnU5N7XUX/tpp2cOH+7d1fl6qjy5R4D8lyTr004 -UBNV6PrfOB1jRV+GATefjpv1KEGyP06cKD741xzS8Gc --> ssh-ed25519 X51wxg h1LfGf2RiFSAaUbLjAivqkX/f0rvxAO905NUYCrX7gk -ppAwL7fboGHlPptL2uQU5nBUI1FXCs6Ds3TMzG8WKxA ---- XgL6A4y8r8g55SKB86IIv+vb3Yo3ovpH+KQURMAtwg4 -"ڐb.cbEr{l(ӧP2e#3CP |I0ܥS@ʪQY'5 \ No newline at end of file +1JcEgjO1//IKYtTSj6bwhjudrpcYuaHAa62lhIL0m6ScSaMcZhGIy8SWU+LvlgM4 +eGYvzinsVhxCAgSJnD81yKSOjU0U+BoY1egx6DTAD59YR+IJ299yM1kjqjJhP3lc +fomOiDbr7mz0UoD2/Pe1Q2ps49rYkVH+ms7Dt9jKyYh7TwsyWitsvHEoXHjhG/u3 +PjLCVe3ngJtPagl42g3otOpmiZ1ycx/HP9ppJvQYoH6VUt9x9nPjUqtUQf66jwSn +87lfDXpGoyPO/pKX+IR45zGE4mVHfYsGzfNJMHyE2AImqxfAoZxqmRdQiQLCVihy +4xuHqWeuHN+Q6KAvhlnhRA +-> ssh-ed25519 /vwQcQ ShQtj+r8CjS6zB2T4IYps21Wt8psIzrrff9NmibGQRI +dGBMjJfL11Asv+w5FrTJo1iknZZQNekcxoaLxmzAJAI +-> ssh-ed25519 0R97PA hhRQZ7ddcQtQfwLHADUz6LI3lofzMxNfsLBSsN+keUA +sMKxjsYj+f75tMsM6d4dqLgTozzRcCzZQf9rgjRi4Wk +-> ssh-ed25519 5rrg4g OETtCVypHjgLnenHGL6inIhhestIUEF0LVfJVu6HBSY +4GWYGsrHaCQURF6ffwN67Sz0DSwBWJ+cBn4WsA9+bm4 +-> ssh-ed25519 cvTB5g 5QS4yEkwZDcRKx5w9ip/XW2RUKuDoR9hjT2rITG9bj0 +a6uP4DJZuOEy5wFnCoM1pUd5p1ySSNXBd8WINORz314 +-> ssh-ed25519 Wu8JLQ 4/ETnzSAyvb1rm30ZXxBvWrCVvYzmvEjjai4W+nfEmU +8YpBxgtgNASRGABkPIWV19iQdcK5OI2toSefifCJi6A +-> ssh-ed25519 EIt1vA pKBHFdt17ruSWarLGRMv9Jg5p4owmb05Chqi1waUlEM +21pDqeyKGbmkoHblA6LujvYNMo1DQ6u+0KjASPp88L4 +-> ssh-ed25519 X51wxg p7PTrP8g6+85BCyujUAI6h8D5dQOWV4n72Cu2wQzBls +X9Sz+dmsnWfVn7RfdQoNdK9ifDKuyqa4QnIz+OfK1xY +--- JD+a9OJUT/rKwLe2m4naby7JV5VE/d4fDaeg2Edyl5I +]= +8Ltmr]e-\Q=: Yx:6NnI祐dc0Y0C ]M D \ No newline at end of file diff --git a/machines/hackens-org/secrets/django.age b/machines/hackens-org/secrets/django.age index 50830db..8340af8 100644 --- a/machines/hackens-org/secrets/django.age +++ b/machines/hackens-org/secrets/django.age @@ -1,28 +1,30 @@ age-encryption.org/v1 --> ssh-ed25519 JGx7Ng eP+ESYHBywDai4xBqYPvBvTyim3UGJ7wr4P8X4ba7UE -QxAZQDfWP0wATQSovLViFVOlA9OS7MXG8QkK3fLh1gs --> ssh-ed25519 kXobKQ J6L8DDpQBMDtNyYB93QRAvihFxLRqT4LmMpejMDOviY -6C3myA6TyAVE2qi3X3VDgcmCAYEz+fmFKD3iZXhRbCc --> ssh-ed25519 7hZk0g 4FThmeWrL/ZjQ0d4ZiEWNloWCQKiQzceG5zC1qFSpVw -Hr8sF1BZ/EhBc2q4HiAxX/UsUNE69o3M07bKtm+sgXQ +-> ssh-ed25519 JGx7Ng eXYZhPOAu5XuLnLyVZEWG0yGReNd1NrYoZaYWk03rAw +rMmxeUr95ruA24E5rchZ7dWCaJOerRmulpjwbAtqqCA +-> ssh-ed25519 kXobKQ rJXA+IoLwVLV/EUlDBQztg1jDIj36u5k7C0wDEfR+UQ +2vWEQ52uMZ+cQvXIdMelvgzeUZ/8bENDJCQDHDuKLaU +-> ssh-ed25519 7hZk0g O9G401J2twPY8gB6uYTLkpDSMQRZB3ScmlS91WzWfjU +7piYGZj0UbyS+KnSVfZthI3HfaNcc0eadRAORtyTd0o -> ssh-rsa krWCLQ -y4Bh1scvxuDLaQ7rgmKr3nQwPv/8809YVU6M2vFNnkaxn34PRlnVr0Od4yzGGwHQ -gwi6D6XUKrV2Eb7MUHuIPEktoH8m3T3W9NumIjKa6xeG6kOEvB7lqeZogD1oZHBm -5QgqiAqK+AWfWInYJIaBiLvlq2j9r7MKAktGxcSHRy3U0/50sJR+0NPlhfMtzD8F -2l92Ygd9IrbjzmWlTbD9NVHsYUSrQYgmZDoPiMfu0DQ2u38c3KO8X8VWMhXNag05 -+NozK1JJjtjpCMJ3x2LVPffpc26Ae+SemDswz8YzL7ty+q1OhITjmteghIAS5OC6 -DMzWtxYdYlV+tkHtleRxSQ --> ssh-ed25519 /vwQcQ ZPhe+5mviR2DW4v08psdcIxWVME0bXIV9Mil3RBV0wY -ydxxFV2LNQbB+qUxErPWD0kQlww8VEy5QH/cOtNe/bs --> ssh-ed25519 0R97PA PhhiYnOnWVlo72hfziFp+lX/WCFh4MJMt+fTbN1cCxI -pTTlibd1qJfb+sJG8oBYlDsL9ZDIQS2Dey7z/R2czzs --> ssh-ed25519 cvTB5g s28aAPLJH2t4ayKh7PqFwofXfEiTlriRc9MdOB/Cxks -CrZuIxEjWIoiso2GBHfrQz9RzJiOwJS4MMQ9BK0EMms --> ssh-ed25519 Wu8JLQ g3LDZgXbSgi99JVqIi/qHabiTGUy78Iq7mF6d+aNs0g -ROxjZ6YGgOESakfnG6h7GHxzYvVnBhKtZACw6phRcXA --> ssh-ed25519 EIt1vA 0QQiqXBevVmvQRf9FAF4BcrOmNsXbXEoZ5u4AiviCCM -Q+znzyYsbL9kgME2zg+bOmEC5ph+XBEMrMKqTFp+Upc --> ssh-ed25519 X51wxg Do46KJNTon7jk1STJi6zpFG38X2G/ZDrVwm9hE6Xa30 -sXh3e7iydjj4PXuqsp2NIisvLkiPlpNiM2QNoMWjQhc ---- XeNUWOX/1D64jffLb0iGmTF5kViEeQAnxOpZ7NpRjI4 -myJsFӂs|$h[~Nў@EsB,'ܬ} >Kvx|&ϗp"Ftm8 \ No newline at end of file +bFQHI2oqIXEor7qbt4QJfPC0q4PanQ3lUp/sNJbsA54OZAW5b6yC2HOeYjbv1KQZ +JdOeKZEruUlxPkNBEUpvz777THUnwlTHNxRxO//mDyHGU9PwgyIQS0aMf4Vkpfn7 +OZMJrCmyYh1Hx2olnJjioMC0H3hBeuAbm4hJYu1EEfhCzhyNc8jbgn8s0VTWBeDo +w8+Nxo3/IOimSI2qaZGBFl/3yE73KfuiYw68vRYkrPWGviDeyCEBJpYcmBsiu81s +e0mTkZdMBMwVwceaYakDc7fK8ij9s3fpKXvJ4EJ2qqUG6ThsHN4eHNNRbau10Zvs +YNKk3d6TpoyPl37eqy9i5w +-> ssh-ed25519 /vwQcQ DkKWQydhpA7Lu0NZH6VWG9Jxs8TdfpvV+eHLc8S82Xs +fvDQQntMZHrLNBxHWsR7R4hb5gnCzCVqPeHFTOrrBKg +-> ssh-ed25519 0R97PA 5Z29MXm0pPIkEihLzGI/hB82keRx+OoVwgHL+pTd1m4 +l+FnUyvBzeeNT2dlbXJQQn5QNd+2za58BwPCqE1rTWw +-> ssh-ed25519 5rrg4g 2uDRtM8kUl/Vhws4ibsZiw4Fo7pmgx4MyJtNjyKLTRY +ZOuKQfrs1d4hzvwur8BCPd3BXOP0vGewpgfkUKahEU4 +-> ssh-ed25519 cvTB5g gOS3PUBQlBWqmKIq99lT10hqEEmCKg2xlxfbWSAtxFM +i63Ilu0tzXEtUlJ8jKlCW9SM+un+KePGXbaBr96rb54 +-> ssh-ed25519 Wu8JLQ 2nRMfMlSNQVOdZGklQfgkH2jv8ECmRKML99H1iPbNys +bLxntIPxKRBqEu+ovCU2NJklH1UEQr7miSg83Pfrskk +-> ssh-ed25519 EIt1vA 9MwmTDKECbLsFwQYfQaF6RlOmYdlu3iLOCFQopifuiQ +GZl2HMbgI+u6oAVFSa6zV+d3ra9QbmJcITsrMbxU/pk +-> ssh-ed25519 X51wxg qRnN1ZKEBckkixg7wgAqDphIRULurzrd+dj8l2u6RRQ +gfdYoCOppQ/ztSY9tEa8PYEbyx5rzu3Qu7Ba/OvcA78 +--- q31//bFmbqBhs9r8hy21qyVIwqSy7sYXRn1a/XIrfJc +*RTRtrCA_j]Dpnw J`j_fgOOX1ẁv \ No newline at end of file diff --git a/machines/hackens-org/secrets/matterbridge-env.age b/machines/hackens-org/secrets/matterbridge-env.age index 58099a6..ee4ab7c 100644 Binary files a/machines/hackens-org/secrets/matterbridge-env.age and b/machines/hackens-org/secrets/matterbridge-env.age differ diff --git a/machines/hackens-org/secrets/prometheus-webconf b/machines/hackens-org/secrets/prometheus-webconf index 3c51743..c3c3e3c 100644 Binary files a/machines/hackens-org/secrets/prometheus-webconf and b/machines/hackens-org/secrets/prometheus-webconf differ diff --git a/machines/hackens-org/secrets/secrets.nix b/machines/hackens-org/secrets/secrets.nix index c7ebc66..f9ee762 100644 --- a/machines/hackens-org/secrets/secrets.nix +++ b/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"); } diff --git a/machines/hackens-org/secrets/snipeit.age b/machines/hackens-org/secrets/snipeit.age index 7c90bd1..3d76be6 100644 Binary files a/machines/hackens-org/secrets/snipeit.age and b/machines/hackens-org/secrets/snipeit.age differ diff --git a/machines/hackens-org/secrets/wg-key.age b/machines/hackens-org/secrets/wg-key.age index 3f6e811..258092e 100644 Binary files a/machines/hackens-org/secrets/wg-key.age and b/machines/hackens-org/secrets/wg-key.age differ diff --git a/pubkeys/agb01.keys b/pubkeys/agb01.keys new file mode 100644 index 0000000..1f42963 --- /dev/null +++ b/pubkeys/agb01.keys @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO2OaboCujXWTaLuIB6+Elrkf6IzFRJTnSZhaIhjinta