diff --git a/nix-system-configs/modules/system_scripts/gcloud_backup.nix b/nix-system-configs/modules/system_scripts/gcloud_backup.nix index 9ca9670..379690b 100644 --- a/nix-system-configs/modules/system_scripts/gcloud_backup.nix +++ b/nix-system-configs/modules/system_scripts/gcloud_backup.nix @@ -69,6 +69,7 @@ export GOOGLE_APPLICATION_CREDENTIALS="${config.sops.secrets.gcloud_bucket.path}" export PATH="${lib.makeBinPath [pkgs.postgresql pkgs.gzip pkgs.google-cloud-sdk pkgs.gnupg pkgs.coreutils pkgs.gnugrep]}:$PATH" + gcloud auth activate-service-account --key-file="$GOOGLE_APPLICATION_CREDENTIALS" TIMESTAMP=$(date +%Y%m%d%H%M%S) BACKUP_DIR=$(mktemp -d) @@ -97,6 +98,7 @@ export GOOGLE_APPLICATION_CREDENTIALS="${config.sops.secrets.gcloud_bucket.path}" export PATH="${lib.makeBinPath [pkgs.mariadb pkgs.gzip pkgs.google-cloud-sdk pkgs.gnupg pkgs.coreutils pkgs.gnugrep]}:$PATH" + gcloud auth activate-service-account --key-file="$GOOGLE_APPLICATION_CREDENTIALS" TIMESTAMP=$(date +%Y%m%d%H%M%S) BACKUP_DIR=$(mktemp -d) @@ -110,7 +112,7 @@ echo "Backing up MariaDB database: $DB" FILENAME="mariadb_''${DB}_''${TIMESTAMP}.sql.gz.gpg" if mariadb-dump -u root "$DB" | gzip | gpg --batch --trust-model always --encrypt --recipient "${gpgRecipient}" > "$BACKUP_DIR/$FILENAME"; then - gcloud storage cp "$BACKUP_DIR/$FILENAME" "gs://${gcsBucket}/postgresql/$FILENAME" + gcloud storage cp "$BACKUP_DIR/$FILENAME" "gs://${gcsBucket}/mariadb/$FILENAME" echo "Successfully uploaded encrypted $FILENAME" else echo "Failed to backup $DB" >&2