twooeyandClaude Sonnet 5
b43852e733
- Replace the bare-repo post-receive hook with deploy/poll-deploy.sh: Gitea
and the Docker hosts are separate machines, so each box polls its branch
via host crontab instead of needing an exposed webhook receiver.
- Add Blocksy theme + Blocksy Companion auto-install to deploy.sh (free
tier; the paid Book Store starter site still needs a manual license step).
- Fix deploy.sh/backup.sh/restore.sh sourcing .env files as bash: a bcrypt
hash's `$2a$14$...` shape breaks under `set -u`. Replaced with
deploy/lib/env.sh, a literal (non-executing) KEY=VALUE reader.
- Fix docker compose itself mangling the same kind of value: both
`environment: ${VAR}` and `env_file:` run values through Compose's
interpolation, which silently blanks `$identifier`-shaped substrings.
The staging basic-auth hash is now rendered directly into the Caddyfile
by deploy.sh, bypassing Compose's variable system entirely.
- Fix dev/staging/production silently sharing one Compose project (and
therefore one db_data volume) by pinning an explicit -p per environment.
- cron and wordpress now share one environment anchor so they can't drift
apart again (cron was silently missing WORDPRESS_CONFIG_EXTRA before).
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
30 lines
1.3 KiB
Bash
Executable File
30 lines
1.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Restores a backup INTO STAGING ONLY. Deliberately has no production path —
|
|
# the launch gate is "a full backup has been restored into staging," never
|
|
# production overwritten by a drill.
|
|
set -euo pipefail
|
|
|
|
DB_DUMP="${1:?Usage: restore.sh <db-dump.sql.gz> <uploads.tar.gz>}"
|
|
UPLOADS_ARCHIVE="${2:?Usage: restore.sh <db-dump.sql.gz> <uploads.tar.gz>}"
|
|
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
cd "$REPO_ROOT"
|
|
|
|
ENV_FILE=".env.staging"
|
|
|
|
COMPOSE="docker compose -p bookstore-staging -f docker-compose.yml -f docker-compose.staging.yml --env-file ${ENV_FILE}"
|
|
|
|
echo "!! this OVERWRITES the staging database and uploads !!"
|
|
read -r -p "type 'restore' to continue: " confirm
|
|
[[ "$confirm" == "restore" ]] || { echo "aborted"; exit 1; }
|
|
|
|
echo "==> restoring database"
|
|
gunzip -c "$DB_DUMP" | $COMPOSE exec -T db sh -c "exec mysql -u\"\$MARIADB_USER\" -p\"\$MARIADB_PASSWORD\" \"\$MARIADB_DATABASE\""
|
|
|
|
echo "==> restoring uploads"
|
|
ARCHIVE_DIR="$(cd "$(dirname "$UPLOADS_ARCHIVE")" && pwd)"
|
|
ARCHIVE_NAME="$(basename "$UPLOADS_ARCHIVE")"
|
|
$COMPOSE run --rm -T -v "${ARCHIVE_DIR}:/restore:ro" wordpress \
|
|
tar -xzf "/restore/${ARCHIVE_NAME}" -C /var/www/html/wp-content
|
|
|
|
echo "==> restore complete — verify the site before treating the drill as passed"
|