diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 2ff9c9c..5312d59 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: pull_request: - branches: [main] + branches: [master] jobs: test: diff --git a/.gitea/workflows/deploy-beta.yml b/.gitea/workflows/deploy-beta.yml index 7c05d3d..93645ca 100644 --- a/.gitea/workflows/deploy-beta.yml +++ b/.gitea/workflows/deploy-beta.yml @@ -3,7 +3,7 @@ name: Deploy Beta on: push: branches: - - main + - master jobs: unit-tests: @@ -45,7 +45,7 @@ jobs: COMPOSE_DATABASE_URL DJANGO_ENV DJANGO_SECRET_KEY DJANGO_DEBUG \ DJANGO_ALLOWED_HOSTS || true - PROJECT="client-ci-${{ gitea.sha }}" + PROJECT="client_site-ci-${{ gitea.sha }}" cleanup() { docker compose -p "$PROJECT" down -v --remove-orphans || true; } trap cleanup EXIT @@ -66,6 +66,7 @@ jobs: SERVER_INFRA_ROOT: /home/westfarn/Documents/repos/server-infra ANSIBLE_PRIVATE_KEY_FILE: /home/westfarn/.ssh/ansible_deploy steps: + # --app MUST match server-infra app_catalog (this package slug). - name: Deploy client_site beta to all webservers run: | "$SERVER_INFRA_ROOT/scripts/deploy.sh" \ diff --git a/.gitea/workflows/deploy-prod.yml b/.gitea/workflows/deploy-prod.yml index dbd6825..e91ad41 100644 --- a/.gitea/workflows/deploy-prod.yml +++ b/.gitea/workflows/deploy-prod.yml @@ -43,7 +43,7 @@ jobs: COMPOSE_DATABASE_URL DJANGO_ENV DJANGO_SECRET_KEY DJANGO_DEBUG \ DJANGO_ALLOWED_HOSTS || true - PROJECT="client-ci-${{ gitea.sha }}" + PROJECT="client_site-ci-${{ gitea.sha }}" cleanup() { docker compose -p "$PROJECT" down -v --remove-orphans || true; } trap cleanup EXIT @@ -64,6 +64,7 @@ jobs: SERVER_INFRA_ROOT: /home/westfarn/Documents/repos/server-infra ANSIBLE_PRIVATE_KEY_FILE: /home/westfarn/.ssh/ansible_deploy steps: + # --app MUST match server-infra app_catalog (this package slug). - name: Deploy client_site prod to all webservers run: | "$SERVER_INFRA_ROOT/scripts/deploy.sh" \ diff --git a/README.md b/README.md index 33d18a6..8ef986f 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,9 @@ cp .env.prod.example ~/Documents/secrets/acme_site/acme_site_prod.env # Flip only purchased FEATURE_* flags. Fill provider secrets. ./scripts/validate-env.sh ~/Documents/secrets/acme_site/acme_site_prod.env -# 5. Infra: Postgres on 10.0.0.230, server-infra app_catalog, NPM, CI. +# 5. Infra: add `` to server-infra app_catalog (same key CI uses as +# `--app` after bootstrap, e.g. print_forge). Postgres on 10.0.0.230, NPM. +# Secrets: ~/Documents/secrets//_{prod,beta}.env # 6. Deploy. Create a portal user (createsuperuser). ``` diff --git a/scripts/validate-env.sh b/scripts/validate-env.sh index d24e86a..fe4ee1b 100755 --- a/scripts/validate-env.sh +++ b/scripts/validate-env.sh @@ -128,7 +128,7 @@ done if ((${#missing[@]} > 0)); then echo "Missing required environment variables in $ENV_FILE:" >&2 printf ' - %s\n' "${missing[@]}" >&2 - echo "Copy .env.prod.example to ~/Documents/secrets/_site/_site_${DJANGO_ENV}.env and set values." >&2 + echo "Copy .env.prod.example to ~/Documents/secrets//_${DJANGO_ENV}.env and set values." >&2 exit 1 fi