From 1d95056e239116b0cfbc608e9f81c21231064d10 Mon Sep 17 00:00:00 2001 From: Ricearoni1245 Date: Mon, 2 Mar 2026 11:26:01 -0600 Subject: [PATCH] fix: change expected host for deploy 2 --- .env | 4 +++- .env.example | 2 ++ .gitea/workflows/deploy.yml | 5 +++-- scripts/backup.sh | 15 +++++++++------ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.env b/.env index a3cf921..ad7e3a3 100644 --- a/.env +++ b/.env @@ -43,4 +43,6 @@ PASSWORD_RESET_TTL_MINUTES=30 PASSWORD_RESET_RATE_LIMIT_PER_MINUTE=5 PASSWORD_RESET_CONFIRM_RATE_LIMIT_PER_MINUTE=10 EXPECTED_PROD_DB_HOST=postgres -EXPECTED_PROD_DB_NAME=skymoney \ No newline at end of file +EXPECTED_PROD_DB_NAME=skymoney +EXPECTED_BACKUP_DB_HOST=127.0.0.1 +EXPECTED_BACKUP_DB_NAME=skymoney diff --git a/.env.example b/.env.example index 0263758..7b8dd0c 100644 --- a/.env.example +++ b/.env.example @@ -21,6 +21,8 @@ RESTORE_DATABASE_URL=postgres://skymoney_app:change-me@127.0.0.1:5432/skymoney_r ADMIN_DATABASE_URL=postgres://postgres:change-me@127.0.0.1:5432/postgres EXPECTED_PROD_DB_HOST=postgres EXPECTED_PROD_DB_NAME=skymoney +EXPECTED_BACKUP_DB_HOST=127.0.0.1 +EXPECTED_BACKUP_DB_NAME=skymoney # Auth secrets (min 32 chars) JWT_SECRET=replace-with-32+-chars diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index c492355..c3d63f8 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -63,9 +63,10 @@ jobs: # Mandatory pre-migration backup export EXPECTED_BACKUP_DB_HOST="${EXPECTED_BACKUP_DB_HOST:-127.0.0.1}" + export EXPECTED_BACKUP_DB_NAME="${EXPECTED_BACKUP_DB_NAME:-skymoney}" BACKUP_ENFORCE_TARGET_CHECK=1 \ - EXPECTED_PROD_DB_HOST="$EXPECTED_BACKUP_DB_HOST" \ - EXPECTED_PROD_DB_NAME="$EXPECTED_PROD_DB_NAME" \ + EXPECTED_BACKUP_DB_HOST="$EXPECTED_BACKUP_DB_HOST" \ + EXPECTED_BACKUP_DB_NAME="$EXPECTED_BACKUP_DB_NAME" \ BACKUP_DIR=/opt/skymoney/backups \ bash ./scripts/backup.sh diff --git a/scripts/backup.sh b/scripts/backup.sh index ba3e1a6..fd73c52 100644 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -27,8 +27,11 @@ extract_db() { } if [[ "${BACKUP_ENFORCE_TARGET_CHECK:-0}" == "1" ]]; then - if [[ -z "${EXPECTED_PROD_DB_HOST:-}" || -z "${EXPECTED_PROD_DB_NAME:-}" ]]; then - echo "BACKUP_ENFORCE_TARGET_CHECK=1 requires EXPECTED_PROD_DB_HOST and EXPECTED_PROD_DB_NAME." + BACKUP_EXPECTED_HOST="${EXPECTED_BACKUP_DB_HOST:-${EXPECTED_PROD_DB_HOST:-}}" + BACKUP_EXPECTED_NAME="${EXPECTED_BACKUP_DB_NAME:-${EXPECTED_PROD_DB_NAME:-}}" + + if [[ -z "$BACKUP_EXPECTED_HOST" || -z "$BACKUP_EXPECTED_NAME" ]]; then + echo "BACKUP_ENFORCE_TARGET_CHECK=1 requires EXPECTED_BACKUP_DB_HOST/NAME (or EXPECTED_PROD_DB_HOST/NAME)." exit 1 fi @@ -40,13 +43,13 @@ if [[ "${BACKUP_ENFORCE_TARGET_CHECK:-0}" == "1" ]]; then exit 1 fi - if [[ "$ACTUAL_HOST" != "$EXPECTED_PROD_DB_HOST" ]]; then - echo "Backup target host mismatch. expected=$EXPECTED_PROD_DB_HOST actual=$ACTUAL_HOST" + if [[ "$ACTUAL_HOST" != "$BACKUP_EXPECTED_HOST" ]]; then + echo "Backup target host mismatch. expected=$BACKUP_EXPECTED_HOST actual=$ACTUAL_HOST" exit 1 fi - if [[ "$ACTUAL_DB" != "$EXPECTED_PROD_DB_NAME" ]]; then - echo "Backup target db mismatch. expected=$EXPECTED_PROD_DB_NAME actual=$ACTUAL_DB" + if [[ "$ACTUAL_DB" != "$BACKUP_EXPECTED_NAME" ]]; then + echo "Backup target db mismatch. expected=$BACKUP_EXPECTED_NAME actual=$ACTUAL_DB" exit 1 fi fi