diff --git a/ops/secrets/besadii.age b/ops/secrets/besadii.age index 50c2d1442..1b8ef6758 100644 Binary files a/ops/secrets/besadii.age and b/ops/secrets/besadii.age differ diff --git a/ops/secrets/buildkite-agent-token.age b/ops/secrets/buildkite-agent-token.age index 66802310b..48b6d7a16 100644 Binary files a/ops/secrets/buildkite-agent-token.age and b/ops/secrets/buildkite-agent-token.age differ diff --git a/ops/secrets/buildkite-graphql-token.age b/ops/secrets/buildkite-graphql-token.age index 6ebf3efca..2b3c2fc43 100644 Binary files a/ops/secrets/buildkite-graphql-token.age and b/ops/secrets/buildkite-graphql-token.age differ diff --git a/ops/secrets/buildkite-ssh-private-key.age b/ops/secrets/buildkite-ssh-private-key.age index c9aa98827..c8ce1a154 100644 Binary files a/ops/secrets/buildkite-ssh-private-key.age and b/ops/secrets/buildkite-ssh-private-key.age differ diff --git a/ops/secrets/nix-cache-priv.age b/ops/secrets/nix-cache-priv.age index 0381fb129..47d185b9f 100644 --- a/ops/secrets/nix-cache-priv.age +++ b/ops/secrets/nix-cache-priv.age @@ -1,15 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 dcsaLw 0Pp+oYDW8qhXoui/ewFhOTP10+JNOMS5qw66SuVHsXg -Usi+hC3pq8gzqp/taDJr2C+7fM1qxunhrngbyGrUMJ8 --> ssh-ed25519 zcCuhA xO33hAmuSPrpYeZXX1saM6mPYL5M6biLtBrsxc73+is -S/pyKMUvn7zjjL3uIy3AJCkag4HpoOTh5SMYx/ZJ+rU --> ssh-ed25519 CpJBgQ D1PyFsBzoKLMocbcQpy4PE7lFQGweoI7MJDuAzDRUhM -9+7ofW8vB3ZdS4A9nU0Rq+c4AJQPTZ0Bo/R3z1FY3io --> ssh-ed25519 aXKGcg u7+l6RDdquEw0/e55x+Yx/W0+019qNsxJzR8DCkxwj0 -tseOgvoIQk5QG65IOqBg65n7ToFXTjHT+QhPT1/9PE0 --> ssh-ed25519 OkGqLg Hsk569u9xxHWQZKNqqxpQbFaX4KDjS9VRqE808vh/kA -kiaoD3XCcrqfYEbneU+L7b2yPHo6ioUhtpxI9uEVnJw --> a{7g#q4^k;\ehX"w` 9_Coqݷ9mtK5 \ No newline at end of file +-> ssh-ed25519 dcsaLw jxVnXH/lNJb3lH4JkGApcJcPD7+X6L1z13ohh9LJXzE +rFIfLi+UGKcA5fG4nEnfmq7vViA35RaOcZTq1rOG30I +-> ssh-ed25519 zcCuhA FU/Sr6BjcagWLy/2t+9EWuUtnmNmaMoyPcbuUrOdUTw +mbNVkug7IWYuQu6nKgIti+B9NaVk/jnaJ24HR50Nbuw +-> ssh-ed25519 1SxhRA oggSw/KBt4XK2AAZWhrf2gaCy2yprAjpidpb66Vzb0o +7NvukFEo/7WwOTfkIinrnyweAh6G817yJhPYP5i8lIQ +-> ssh-ed25519 ch/9tw 4jcEfZ5rDJb9zTj/Tq2KLWWHvaZOViPwMqRcLS9IUE0 +izFeDgb5zu6lwUXOtOKn3abUMDmkKXY4MgMO+3myzRQ +-> ssh-ed25519 CpJBgQ Kg3WVgPjE3l6yRmMrZh3lWbaHVf+J+PWG8HUaGmO5Vc +G84ko9Ip9nzSEVjpPotdxBLf7IeB1haYihDMQ9BYGno +-> ssh-ed25519 aXKGcg KsjGwfFQywYtTv19cogd+JthBvGo3saoGLB8xqTp1HI +QjiAypzrQwMLST1/raFOMl8V64wRT01uN5suw/jCrHw +-> ssh-ed25519 OkGqLg Qnkl+w1/6TsPGBp9GY54AhFOezGzkTIn5/w679Zcilg +7Q6Zr47E5YqRymSjASWA4LzxynbPU49tM2YDeu0Fdy0 +-> ssh-ed25519 xR+E/Q 8okVJ7nL35tujMgHPeoX3YZoOdoTgxcnGlEnJiIHnwQ +MfWoPHhBKZAggdwecjqpU6sU6tl2k7rdoBd3iMcCu7k +--- TSagyvcu/L1JT08E9NuJHPel2f4BjlrBqNtOyElDFjY +Z֨ŚM/C:}44f~M4;%ˊVBb9D))-yrS یMRy$5n.bmTw,}w39/pLL=ygDaW- 5'"w"O \ No newline at end of file diff --git a/ops/secrets/nix-cache-pub.age b/ops/secrets/nix-cache-pub.age index ae06f49d6..97a09f1eb 100644 --- a/ops/secrets/nix-cache-pub.age +++ b/ops/secrets/nix-cache-pub.age @@ -1,16 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 dcsaLw +jfxfM1YDu5CoYtFeRWtpkUQhmFWn/kNBYsBnie7BVg -XxL9l87hXD0zCUEwbSR9OHSYgpOw89Km5iyxPPnVDGQ --> ssh-ed25519 zcCuhA VAoDkN2gwErUFE/59V4IF9PbSBSleOjt2gosvYnHxWg -Pf6eh8EfAdATjZIkQfhhqOXuJXIdwIpybITcn+rcutI --> ssh-ed25519 CpJBgQ C6zIv78gu+wBeAjhmXANegSNqGHnugemXBPQcTimgxg -80109g83Hk+smWuZkTIZJ6VFQqJ+LU1boWKQIH1AHjc --> ssh-ed25519 aXKGcg lPb+kGr0vuJkQO6VutAm4Yh1CVi/XfqNdGbAh/B7ZRk -h4xb++7I9iv8208oqY0xLruA1r62mepISFcusczdbgs --> ssh-ed25519 OkGqLg aOHt9OR8JChtYpclkgn9wCFnlayFje7WsMGQb8AqChU -3VRTDMUwFtDcoxGU/wiBzTvS0SB/xOpBG6s+ENvAXVE --> Kow$7|\-grease -8OGnQnY7gm4vMJRXjnBogA0HRU7hqIxs2sErFc7sV1CUNkZlFjdK8tZomlNwshjc -p18HgtjJnaGhSqg1LyP7cJAo/XnSwDYCeNna/6vdlKBR3JeuOGTmx1NIG/cGSg ---- w+jJplb/J3av+UcltcFf4qSqHoQ8Ol8lH/fFB3051Gw - qIe:1*`j8snHcy7õ(.x D_}%)P,D6SHU9딬0 8\' \ No newline at end of file +-> ssh-ed25519 dcsaLw ZBYqyCd+eJH8b6nuG3Off01ZRz+C8wBlXzXsHtKrPA8 +6xsUZDVJ+gsKW2XdEdRUlQv6enO3lSy7pfydhAhA2UM +-> ssh-ed25519 zcCuhA aYLfg5xvfDAL2fRCd/cKaNAf3nuMUKqkqtLQyPN6elE +vfVIu+7QKOzrmZ08drUdBYTksaT+kHbj7kVxl5QPb9U +-> ssh-ed25519 1SxhRA x9YVX3XS0BNy6uWPACM+Q6dNY2/Grn4gBAZt7ZCc5GQ +m7KFpWpsM/5tNeFgPQb6VosYJv/IJES79H3E5epvvgE +-> ssh-ed25519 ch/9tw MtZL+fIC9PeF4j4mJY+oF3KurgBtIrjP2Cnga6VV/Uk +wGMsl48+SDfskXjtsMRheWvelDON6pMR288GAKhY2PU +-> ssh-ed25519 CpJBgQ ICy5pQo+1pEXDvvvCHJahEnt8P0Ws/KSLg5eruNNS1Y +JBds2McxDga23lojtVlm3QFav9D/SnfO14RCkz/vy3o +-> ssh-ed25519 aXKGcg sO0sT+XRpZ05yn49HlPYHQi3/wrJ7dpy+S7L5HJjCVY +ZDMWrcYhie2tzad5qPuAU1E978LVLTkQGb1rrjWsxeo +-> ssh-ed25519 OkGqLg rl4dVxI+gUNyjdrQpRpAV/7HHrcY6sT8a/mxBWidmCM +HCF9eR6GstX9FOHkTpTU8oulphwu+LCbsr1NyWktWPQ +-> ssh-ed25519 xR+E/Q lhTKIL2kGhR/de7kRShGCHMRsZVPlXfGxaMX3Q1Op1M +fYiPRboq/bAsbtZQfbS1zlV7HjxeOKwFcafZSDETpdI +--- /UN5QN0v3yyH0Vh9tv1u8GXnBX9j8nTkzezYVIXK+ds +LtYS̰۲2EqnH`-(0}۱ʬ&ٯCL#.yMywy9mF QhLu \ No newline at end of file diff --git a/ops/secrets/secrets.nix b/ops/secrets/secrets.nix index a8b3675ed..bbebb17d3 100644 --- a/ops/secrets/secrets.nix +++ b/ops/secrets/secrets.nix @@ -37,12 +37,13 @@ let sandunyDefault.publicKeys = admins ++ [ sanduny ]; bugryDefault.publicKeys = admins ++ [ bugry ]; nevskyDefault.publicKeys = admins ++ [ nevsky ]; + cacheDefault.publicKeys = whitbyDefault.publicKeys ++ [ nevsky ]; in { - "besadii.age" = whitbyDefault; - "buildkite-agent-token.age" = whitbyDefault; - "buildkite-graphql-token.age" = whitbyDefault; - "buildkite-ssh-private-key.age" = whitbyDefault; + "besadii.age" = cacheDefault; + "buildkite-agent-token.age" = cacheDefault; + "buildkite-graphql-token.age" = cacheDefault; + "buildkite-ssh-private-key.age" = cacheDefault; "clbot-ssh.age" = whitbyDefault; "clbot.age" = whitbyDefault; "depot-inbox-imap.age" = sandunyDefault; @@ -53,8 +54,8 @@ in "irccat.age" = whitbyDefault; "journaldriver.age" = allDefault; "keycloak-db.age" = whitbyDefault; - "nix-cache-priv.age" = whitbyDefault; - "nix-cache-pub.age" = whitbyDefault; + "nix-cache-priv.age" = cacheDefault; + "nix-cache-pub.age" = cacheDefault; "owothia.age" = whitbyDefault; "panettone.age" = whitbyDefault; "smtprelay.age" = whitbyDefault;