4e97d8e5dc
All checks were successful
PR build (required check) / changes (pull_request) Successful in 6s
shell-lint / shellcheck (pull_request) Successful in 7s
secrets-guard / encrypted (pull_request) Successful in 5s
PR build (required check) / build-backend (pull_request) Has been skipped
PR build (required check) / build-frontend (pull_request) Has been skipped
PR build (required check) / gate (pull_request) Successful in 2s
PR build (required check) / validate-observability (pull_request) Successful in 18s
Environments stop being machines. Until now each box WAS an environment --
"beta" named both a deploy target and a host, "the desktop" named both the
operator's computer and the dev server -- so every path could assume one
environment per host and hardcode /opt/thermograph, /etc/thermograph.env and
ports 8137/8080. That assumption ends here:
vps1 75.119.132.91 Forgejo, Grafana/Loki, the portfolio site, and DEV
(own Postgres, mesh-only on 10.10.0.2:8137)
vps2 169.58.46.181 PROD and BETA as two Swarm stacks sharing one
TimescaleDB instance, plus Centralis, Postfix, backups
desktop AI model hosting + flex Swarm capacity, no environment
Nothing live has moved; the ordered cutover is in
infra/deploy/RUNBOOK-vps1-vps2-cutover.md.
deploy/env-topology.sh is the single source of truth: env -> host, checkout,
branch, deploy mode, stack name, env file, LB ports, DB role/database, service
prefix. THERMOGRAPH_ENV is the input, and on vps2 it is the only thing
distinguishing a beta deploy from a prod one -- deploy.sh refuses to run when it
disagrees with the checkout it was invoked from. The host-wide secrets-env and
deploy-mode markers survive only as a fallback for a single-environment box.
Beta gets its own stack file rather than an overlay (a merge cannot REMOVE the
db service, and beta having no database of its own is the point). Its services
are prefixed beta-*: Swarm registers a service's short name as a DNS alias on
every network it joins, so two stacks both calling a service `web` on the shared
data network would let prod's frontend resolve a beta task. Prod's stack, env
and LB config are untouched.
One Postgres, two databases with two roles: deploy/db/provision-env-db.sh
creates thermograph_beta (NOSUPERUSER, owns only its own database, CONNECT
revoked from PUBLIC) plus a <role>_ro for ad-hoc queries, and refuses to run for
the environment that owns the instance -- doing so would demote prod's bootstrap
superuser.
Fixes that co-residency would otherwise have broken silently:
- CI secrets are keyed by host (VPS1_SSH_*, VPS2_SSH_*). SSH_* meant "beta" and
also "the Forgejo box" because those shared a machine; that conflation is what
once had the prod backup dumping beta.
- The nightly backup dumps BOTH application databases to separate off-box
prefixes, and fails loudly on a missing one instead of skipping it.
- Alloy stopped deriving the `host` label from the node -- on vps2 that would
have filed every beta line as prod, feeding prod's alert rules with beta's
traffic. It is now derived per source, with a new `node` label for the machine,
and beta's log volume is mounted via a vps2-only overlay.
- ops/dbq.sh, ops/iceberg.sh and the secrets seed scripts derived their SSH
target and env-file path from the topology instead of hardcoding beta to
75.119.132.91 -- which is vps1's address now.
- Dev's overlay binds DEV_BIND_ADDR (loopback by default, the mesh address on
vps1) instead of 0.0.0.0: correct for a home LAN box, a public exposure of
unreviewed branches on a VPS.
Terraform's hosts variable is keyed by machine with a nested environments map,
and main.tf flattens (host, environment) pairs so two environments on one box
cannot share a checkout. Caddy's single reference config is split per host.
Docs, onboarding and the runbooks are updated throughout, including the security
rationales that co-residency makes false: separate SSH credentials no longer put
a host boundary between beta and prod, and the boundary that remains is the
database and the filesystem.
74 lines
4.7 KiB
Markdown
74 lines
4.7 KiB
Markdown
# infra/
|
|
|
|
Infrastructure for [Thermograph](https://thermograph.org): Terraform host
|
|
provisioning, the SOPS+age secrets vault, WireGuard/Swarm networking, Forgejo,
|
|
Caddy, mail, and the deploy scripts that run the already-built app images on each
|
|
host. This is a domain of the `emi/thermograph` monorepo — a host's checkout
|
|
(`/opt/thermograph`, `/opt/thermograph-beta`, or `/opt/thermograph-dev`) is a
|
|
checkout of the whole monorepo, and `infra/` never builds app source; it only
|
|
runs published images.
|
|
|
|
- **`terraform/`** — provisions/configures hosts (SSH-driven by default; an
|
|
optional GCP-creating module is scaffolded, no live resources yet). See
|
|
`terraform/README.md`. No tfstate is persisted anywhere — treat `apply` as
|
|
executable documentation, not a routine operation.
|
|
- **`deploy/secrets/`** — the git-native SOPS+age secrets vault (every app secret,
|
|
encrypted at rest, rendered at deploy time). See `deploy/secrets/README.md`.
|
|
- **`deploy/swarm/`, `deploy/forgejo/`** — the WireGuard/Swarm mesh spanning
|
|
vps1, vps2 and the desktop, and Forgejo (git + CI + registry), pinned to
|
|
vps1. See `ACCESS.md`.
|
|
- **`deploy/env-topology.sh`** — the single source of truth for where each
|
|
environment (`dev`/`beta`/`prod`) lives: host, checkout path, branch, deploy
|
|
mode, stack/compose name, env file, LB ports, DB role/database, service-name
|
|
prefix. Every deploy path sources it and derives its behavior from it rather
|
|
than guessing from the host it happens to be running on — necessary since
|
|
vps2 alone now runs two environments.
|
|
- **`deploy/deploy.sh`** — the single deploy entry point for dev, beta and prod.
|
|
Takes `SERVICE=backend|frontend|all` plus `BACKEND_IMAGE_TAG`/`FRONTEND_IMAGE_TAG`
|
|
(and, on vps2, `THERMOGRAPH_ENV=beta|prod` to say which of the two checkouts
|
|
it's acting on), resets the host checkout, renders secrets, and routes to the
|
|
right orchestrator per `env-topology.sh`.
|
|
- **`deploy/deploy-dev.sh`** — a thin dev-specific wrapper around `deploy.sh`
|
|
(dev compose overlay, dev's secrets policy). See `DEPLOY-DEV.md`.
|
|
- **`deploy/stack/`** — the **Swarm** path, live on **vps2** for both prod and
|
|
beta: `thermograph-stack.yml` (prod: db, web, worker, lake, daemon, frontend,
|
|
autoscaler, autoscaler-lake) and `thermograph-beta-stack.yml` (beta: the same
|
|
service shape minus `db` and the autoscalers, every service name prefixed
|
|
`beta-`). `deploy-stack.sh`, `autoscale.sh` and `lb/` are shared by both.
|
|
Rolling updates are start-first, health-gated, with auto-rollback.
|
|
`STACK_TEST=1` rehearses the whole stack on throwaway volumes and ports.
|
|
- **`docker-compose*.yml`** — the **compose** path, live only on **dev** (vps1)
|
|
(db, backend, lake, daemon, frontend). `docker-compose.dev.yml` is dev's
|
|
mesh-only overlay; `docker-compose.openmeteo.yml` is the self-hosted
|
|
Open-Meteo overlay (prod only). `make dev-up` also runs this path locally as
|
|
a laptop convenience — that is not an "environment", just a local rehearsal.
|
|
|
|
Which path an environment takes is decided by `deploy/env-topology.sh`
|
|
(`TG_DEPLOY_MODE`, keyed by `dev`/`beta`/`prod`): dev is `compose`, beta and prod
|
|
are both `stack`. The old host-wide marker `/etc/thermograph/deploy-mode` still
|
|
exists as a fallback for a by-hand run with no explicit environment, but it
|
|
cannot describe vps2, which runs two environments in two different checkouts —
|
|
so it is no longer the thing that decides where files go. The workflows never
|
|
need to know which mode an environment runs; they only pass `THERMOGRAPH_ENV`.
|
|
|
|
## Branches & how changes reach each environment
|
|
|
|
- **`dev`** — deploys to **dev on vps1** (`/opt/thermograph-dev`).
|
|
- **`main`** — deploys to **beta on vps2** (`/opt/thermograph-beta`).
|
|
- **`release`** — deploys to **prod on vps2** (`/opt/thermograph`).
|
|
|
|
App code IS environment-staged this way (`dev`→`main`→`release` maps to
|
|
vps1/dev → vps2/beta → vps2/prod via image tags, one `Deploy` workflow keyed by
|
|
branch). **Infra itself is not environment-staged** the same way: `infra-sync.yml`
|
|
fires on a push touching `infra/**` — on `dev` it fast-forwards vps1's dev
|
|
checkout, on `main` it fast-forwards **both** of vps2's checkouts (beta and
|
|
prod) — re-rendering each environment's own env file from the vault. It
|
|
deliberately does **not** roll any service: image tags are the app domains'
|
|
axis, not infra's. A compose or stack change that must recreate containers
|
|
takes effect on the next app deploy, or a by-hand `SERVICE=all …
|
|
deploy/deploy.sh` (or `deploy-dev.sh`) run.
|
|
|
|
Note the asymmetry this leaves: dev's infra checkout tracks `dev`, the same
|
|
branch its app images are staged by. Beta's and prod's infra checkouts both
|
|
track `main` — prod's *app images* are staged by `release`, but prod's *infra
|
|
checkout* follows `main`, same as beta's.
|