diff --git a/hosts/hetzner-arm/containers/mail/profiles/restic.nix b/hosts/hetzner-arm/containers/mail/profiles/restic.nix index 93ed1ec..47999a3 100644 --- a/hosts/hetzner-arm/containers/mail/profiles/restic.nix +++ b/hosts/hetzner-arm/containers/mail/profiles/restic.nix @@ -16,7 +16,7 @@ in { mailConfig.dkim.directory ]; - repository = "s3:s3.eu-central-003.backblazeb2.com/Chaos-Backups/Restic/Mail"; + repository = "s3:s3.eu-central-003.backblazeb2.com/Chaos-Restic/Mail"; passwordFile = "${secrets.restic_password.path}"; environmentFile = "${secrets.restic_env.path}"; createWrapper = true; diff --git a/hosts/hetzner-arm/containers/mail/secrets.nix b/hosts/hetzner-arm/containers/mail/secrets.nix index da61800..d018547 100644 --- a/hosts/hetzner-arm/containers/mail/secrets.nix +++ b/hosts/hetzner-arm/containers/mail/secrets.nix @@ -8,7 +8,7 @@ }; requiredVaultPaths = [ - "api-keys/data/backblaze/Chaos-Backups" + "api-keys/data/backblaze/Backups" "api-keys/data/chaos_mail/system" "api-keys/data/chaos_mail/gotosocial" "passwords/data/mail" @@ -33,8 +33,8 @@ restic_env = { fetchScript = '' cat << EOF > "$secretFile" - AWS_ACCESS_KEY_ID=$(simple_get "/api-keys/backblaze/Chaos-Backups" .keyID) - AWS_SECRET_ACCESS_KEY=$(simple_get "/api-keys/backblaze/Chaos-Backups" .applicationKey) + AWS_ACCESS_KEY_ID=$(simple_get "/api-keys/backblaze/Backups" .keyID) + AWS_SECRET_ACCESS_KEY=$(simple_get "/api-keys/backblaze/Backups" .applicationKey) EOF ''; }; diff --git a/hosts/hetzner-arm/containers/storage/data/rclone_config.template b/hosts/hetzner-arm/containers/storage/data/rclone_config.template index 3d46826..7d85e92 100644 --- a/hosts/hetzner-arm/containers/storage/data/rclone_config.template +++ b/hosts/hetzner-arm/containers/storage/data/rclone_config.template @@ -1,6 +1,6 @@ [Storage] type = combine -upstreams = "Backups=B2:Chaos-Backups" "Photos=B2:Chaos-Photos" "Music=B2:Chaos-Music" "Public=B2:Chaos-Public" "Notes=Notes:" "Personal=B2:Chaos-Personal" "Uploads=B2:Chaos-Uploads" +upstreams = "Music=B2:Chaos-Music" "Public=B2:Chaos-Public" "Notes=Notes:" "Uploads=B2:Chaos-Uploads" [B2] type = b2 diff --git a/hosts/hetzner-arm/profiles/restic.nix b/hosts/hetzner-arm/profiles/restic.nix index 9a8318d..e35bf2e 100644 --- a/hosts/hetzner-arm/profiles/restic.nix +++ b/hosts/hetzner-arm/profiles/restic.nix @@ -13,7 +13,7 @@ inherit (config.services.secrets) secrets; backupSchedules = import "${self}/data/backupSchedules.nix"; - repoRoot = "s3:s3.eu-central-003.backblazeb2.com/Chaos-Backups/Restic"; + repoRoot = "s3:s3.eu-central-003.backblazeb2.com/Chaos-Restic"; in { environment.systemPackages = [ # TODO: add ones in container too