mirror of
https://github.com/zvx-echo6/central.git
synced 2026-08-26 17:31:39 +00:00
deploy.sh: fix central-migrate env (cd + EnvironmentFile) so pre-flight check works
central-migrate invocations were run via bare `cen "$VENV/bin/central-migrate"`, which does not set the working directory or source the EnvironmentFile that the systemd unit provides. This caused the pre-flight --check to fail during the v0.14.6 deploy with `PermissionError: [Errno 13] Permission error: '.env'` because central-migrate tried to read .env from the caller's cwd instead of /opt/central, and the DB DSN was missing. The daemons themselves are unaffected — they always get WorkingDirectory= /opt/central and EnvironmentFile=/etc/central/central.env from systemd. The deploy script is the only place that invoked central-migrate outside that context. Fix: add ENV_FILE=/etc/central/central.env to the config block and a cen_migrate() helper that wraps every central-migrate call with: sudo -u central bash -c "cd /opt/central && set -a && . /etc/central/central.env && set +a && /opt/central/.venv/bin/central-migrate <args>" Replace all four bare invocations (--check preflight, --dry-run, apply, --check post-deploy) with cen_migrate. Exit-code propagation is unchanged — bash -c forwards the inner exit status, so set -e / the ERR trap still fires on non-zero exits. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
9b506dc9d3
commit
05bb293f17
1 changed files with 13 additions and 4 deletions
|
|
@ -25,6 +25,7 @@ CENTRAL_USER=central
|
||||||
UV=/usr/local/bin/uv
|
UV=/usr/local/bin/uv
|
||||||
BACKUP_DIR=/var/backups/central
|
BACKUP_DIR=/var/backups/central
|
||||||
UNITS=(central-supervisor central-archive central-gui)
|
UNITS=(central-supervisor central-archive central-gui)
|
||||||
|
ENV_FILE=/etc/central/central.env
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Helpers
|
# Helpers
|
||||||
|
|
@ -45,6 +46,14 @@ cen() {
|
||||||
sudo -u "$CENTRAL_USER" "$@"
|
sudo -u "$CENTRAL_USER" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Run central-migrate as $CENTRAL_USER with the service's working directory and
|
||||||
|
# environment file, matching what the systemd unit provides via WorkingDirectory=
|
||||||
|
# and EnvironmentFile=. Without this, central-migrate tries to read .env from
|
||||||
|
# the caller's cwd and fails with PermissionError.
|
||||||
|
cen_migrate() {
|
||||||
|
sudo -u "$CENTRAL_USER" bash -c "cd '$DEPLOY_DIR' && set -a && . '$ENV_FILE' && set +a && '$VENV/bin/central-migrate' $*"
|
||||||
|
}
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# ERR trap — fired on any unhandled non-zero exit inside set -e
|
# ERR trap — fired on any unhandled non-zero exit inside set -e
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
@ -138,7 +147,7 @@ done
|
||||||
|
|
||||||
# 4. Migration drift gate — refuse to deploy onto a drifted migration state.
|
# 4. Migration drift gate — refuse to deploy onto a drifted migration state.
|
||||||
log "Migration drift check (--check)"
|
log "Migration drift check (--check)"
|
||||||
cen "$VENV/bin/central-migrate" --check \
|
cen_migrate --check \
|
||||||
|| die "Migration drift detected (central-migrate --check exited non-zero). Resolve drift before deploying."
|
|| die "Migration drift detected (central-migrate --check exited non-zero). Resolve drift before deploying."
|
||||||
|
|
||||||
# 5. Ensure backup directory exists and is owned by $CENTRAL_USER.
|
# 5. Ensure backup directory exists and is owned by $CENTRAL_USER.
|
||||||
|
|
@ -205,7 +214,7 @@ cen bash -c "cd '$DEPLOY_DIR' && '$UV' sync"
|
||||||
|
|
||||||
# 12. Migration preview — show what would run without applying.
|
# 12. Migration preview — show what would run without applying.
|
||||||
log "Migration dry-run (preview)"
|
log "Migration dry-run (preview)"
|
||||||
cen "$VENV/bin/central-migrate" --dry-run
|
cen_migrate --dry-run
|
||||||
|
|
||||||
# 13. CONFIRM gate — unless -y was passed.
|
# 13. CONFIRM gate — unless -y was passed.
|
||||||
#
|
#
|
||||||
|
|
@ -235,7 +244,7 @@ fi
|
||||||
|
|
||||||
# 14. Apply migrations.
|
# 14. Apply migrations.
|
||||||
log "Applying migrations"
|
log "Applying migrations"
|
||||||
cen "$VENV/bin/central-migrate"
|
cen_migrate
|
||||||
|
|
||||||
# 15. Restart all three systemd units.
|
# 15. Restart all three systemd units.
|
||||||
log "Restarting services"
|
log "Restarting services"
|
||||||
|
|
@ -263,7 +272,7 @@ fi
|
||||||
|
|
||||||
# 17. Post-deploy migration check — should be clean (0 pending).
|
# 17. Post-deploy migration check — should be clean (0 pending).
|
||||||
log "Post-deploy migration check (--check)"
|
log "Post-deploy migration check (--check)"
|
||||||
cen "$VENV/bin/central-migrate" --check \
|
cen_migrate --check \
|
||||||
|| die "Post-deploy migration check failed — schema may be inconsistent."
|
|| die "Post-deploy migration check failed — schema may be inconsistent."
|
||||||
|
|
||||||
# 18. Health check — up to 5 retries with 2-second sleep between attempts.
|
# 18. Health check — up to 5 retries with 2-second sleep between attempts.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue