From 672fe926beb9a361ba7d331a221dcf98fa282ea6 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 15:55:59 -0500 Subject: [PATCH] make yt privy to rclone secret and rm grafana cause prometheus chokes --- .sops.yaml | 3 ++- hosts/chunk/borg.nix | 2 +- hosts/chunk/default.nix | 3 +-- secrets/{rclone/chunk.yaml => rclone.yaml} | 29 ++++++++++++++-------- 4 files changed, 23 insertions(+), 14 deletions(-) rename secrets/{rclone/chunk.yaml => rclone.yaml} (66%) diff --git a/.sops.yaml b/.sops.yaml index 11878a5..ce18d4d 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -71,10 +71,11 @@ creation_rules: - age: - *chunk - *cy - - path_regex: secrets/rclone/chunk.yaml + - path_regex: secrets/rclone.yaml key_groups: - age: - *chunk + - *yt - *cy - path_regex: secrets/newsboat.yaml key_groups: diff --git a/hosts/chunk/borg.nix b/hosts/chunk/borg.nix index 6b32f26..9b07eca 100644 --- a/hosts/chunk/borg.nix +++ b/hosts/chunk/borg.nix @@ -4,7 +4,7 @@ ... }: { - services.borgbackup.crashRsync = { + services.borgbackup.jobs.crashRsync = { # systemd.timer(5) persistentTimer = true; paths = [ diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 01ce5a3..9c58b91 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -21,7 +21,6 @@ ./redlib.nix ./vaultwarden.nix ./wireguard.nix - ./grafana.nix ./tor.nix ./conduit.nix ./immich.nix @@ -41,7 +40,7 @@ sopsFile = ../../secrets/services/ntfy.yaml; }; "rclone/config" = { - sopsFile = ../../secrets/rclone/chunk.yaml; + sopsFile = ../../secrets/rclone.yaml; }; "vaultwarden/env" = { sopsFile = ../../secrets/services/vaultwarden.yaml; diff --git a/secrets/rclone/chunk.yaml b/secrets/rclone.yaml similarity index 66% rename from secrets/rclone/chunk.yaml rename to secrets/rclone.yaml index a723f2d..2795e4c 100644 --- a/secrets/rclone/chunk.yaml +++ b/secrets/rclone.yaml @@ -9,20 +9,29 @@ sops: - recipient: age1eg6sxflw6l44fp20sl068sampwd95fm0mnh4ssegrhtktgm50ptqcuspyn enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqbEgzQ2dZdkR1SWhwQlpL - bEx0MXR1N21WS2IwNVBqSTZOYmJxYTRybUd3CnY2N01wVFM4cnoxYTZISWRhc1Ex - VWNBYjV0RWwrVHJrTVZEY24yWDhrSWMKLS0tIFpwZlBxZ2Z5bWhPZTRHbnZrOHp5 - NVptOUlMZWdlSWh6WTA1Wmx1Ly9VOUUKDYYI6SbnZ1y9w3mNXAtrf6FaNwNEAJri - HH8YrsARrAUTNRpO6OkdOfuWuQRiHAGkFHyic+p99m78nYfZzAaxHQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQSU9IV3RtbVliMHNyT1FJ + MnpncUE3RWN5TlpYQ25wWDJ6RmJ0M3liMmxnCjQ2NEJtUHBJTXd0RU5QdmZyZk1q + Vi82L3dqbWpqWERXajhucEM2aEFuc2cKLS0tIFRpRHVZaWV0QnhYcEdKY3JacHBo + YzJ4U2tRZCtKZjNoOXJBMk5VMDM5dXMK9icftp6g+wA+TMDvDojmLemL2lSTlC2F + Qfp1mFhzGnyV3KPhrZ268tqtPXzxuIAkkIJpMunt/xIPGyiVC1GG3g== + -----END AGE ENCRYPTED FILE----- + - recipient: age1sy0at69err83qyml2vqu8xvwjccfws447aaadfvacj2qluw3p45s2mtrw8 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLRVZZNzRZZ1hib2RDcng2 + WlBINkpmekRoWlJjRkFBT0ZYUWx4THlPZERFCmxpNmg4M2UwdGpJWWpFOWZZeGhz + bGI0cGN2T0ZzMGF5NlVrZ0lobWp3UWMKLS0tIEhYREplaFNQYmptZldudG5Xbk5k + TExmcTVmYXBWK0x5d1d6MHh3dG1mVW8KJyAQMYa769ptSDFU0y1+QA642ggsl0YJ + CDESVGHgFWY2wigkVC3CwDMKimSdANGeVfwlYn/fnHMHghAJ5tT3Hw== -----END AGE ENCRYPTED FILE----- - recipient: age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCNDMxR2ZqZUs3L1p5UWFy - cUxVVzl3eXhNdEdKVW12M0o3dkluaFpwR2g4CjgwQzlONFpWRnhYcDV6TUh0SE5Q - dzk0MHpjUVVrai9rUEZIWU80c3doT28KLS0tIG5tUzNVeFNtM0RUYkYrZllDWkIz - SFRuTGtCQWY0Si9ndlYyVTBlZUhlVGsK+xw1uyjf72JxqvYaA+eJXycGqm62J9kh - WVkbwEFE3Z27N/xVgKw4kTFO/ZqrAx9dsF2gPB2wSERJ5ndzR5mzsA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGYldPQ1Z5dHZxVlBaUzA2 + YXNBV3o3aVVGbUdrSmF0R2E3K1FQa3V6OUhrCkFKMmpCNExVL3g1cERRRmVKbC96 + K2lab1RIY1ZTWElxcHJnYWNnZHhtNEkKLS0tIDM5TisyakxOaVdWd2hXWDFwVlF1 + aExPM3ZCL0kvMWpZZlFuTGMvU0pQNEEKTxkA30B3nPOO1Q0ZRiZZKicqvEpJoOL5 + B/PchzkTvSbjPGz55r+Qq3oTHTQ4bwxpZ7T1hMyMcXhws+oftol5/g== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-12-27T00:29:50Z" mac: ENC[AES256_GCM,data:OdFzyPSxUv+nKUC3OFfcvDuP/z6z/94O9nTRoBiEhsjKK30JhjuPSZL/N3AiWM0gEhqLBcvZgWpalKEc5dOJVQTOAm7Koz7aMK8Oi2OxCFeChKnIHnyTL3i194IbcjBzIV0TcU97WRNS1N5+8hSXLsBdStd+XiwCAspOQf8y1uc=,iv:FDoyspPtWf/a47Z6KXT+d71eLRWs0bzBc47rGrAqzx4=,tag:S51hhNAg5ojCCvkHpKIo2g==,type:str]