Wire template CI/deploy to master and the app_catalog slug.

Bootstrap rewrites --app client_site to the catalog key (print_forge, etc). CI was still on main, so cloned clients would never hit server-infra.

.gitea/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [main]
+    branches: [master]
 
 jobs:
   test:

.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" \

.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" \

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 `<slug>` 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/<slug>/<slug>_{prod,beta}.env
 # 6. Deploy. Create a portal user (createsuperuser).
 ```
 

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/<slug>_site/<slug>_site_${DJANGO_ENV}.env and set values." >&2
+  echo "Copy .env.prod.example to ~/Documents/secrets/<slug>/<slug>_${DJANGO_ENV}.env and set values." >&2
   exit 1
 fi