4e97d8e5dc
All checks were successful
PR build (required check) / changes (pull_request) Successful in 6s
secrets-guard / encrypted (pull_request) Successful in 5s
PR build (required check) / build-backend (pull_request) Has been skipped
shell-lint / shellcheck (pull_request) Successful in 7s
PR build (required check) / build-frontend (pull_request) Has been skipped
PR build (required check) / validate-observability (pull_request) Successful in 18s
PR build (required check) / gate (pull_request) Successful in 2s
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.
67 lines
3.2 KiB
Makefile
67 lines
3.2 KiB
Makefile
# docker-compose orchestration only. The app-level targets that used to live
|
||
# here (run, lan-run, stop, migrate, migrate-cache, test, shots, indexnow,
|
||
# venv, clean) moved to the backend/frontend app repos along with the code
|
||
# they operate on.
|
||
|
||
.PHONY: up down db-up db-down dev-up dev-down om-up om-down om-backfill
|
||
|
||
# --- docker-compose stack (backend + frontend + PostgreSQL) ---------------------
|
||
# Requires a POSTGRES_PASSWORD (copy .env.example -> .env). See docker-compose.yml.
|
||
|
||
# Pull each service's published image and start the whole stack (backend +
|
||
# frontend + db) in the background. docker-compose.yml no longer has a
|
||
# top-level `build:` for backend/frontend -- each ships as its OWN image
|
||
# (BACKEND_IMAGE_TAG / FRONTEND_IMAGE_TAG), built in its own app repo (a plain
|
||
# `docker build` there, or that repo's own build-push.yml in CI) -- so `up`
|
||
# here only pulls + runs; it can no longer build in place.
|
||
up:
|
||
docker compose pull
|
||
docker compose up -d
|
||
|
||
# Stop and remove the stack's containers (named volumes persist).
|
||
down:
|
||
docker compose down
|
||
|
||
# Start just the Postgres service (e.g. to run the app against it from a venv).
|
||
db-up:
|
||
docker compose up -d db
|
||
|
||
# Stop the Postgres service.
|
||
db-down:
|
||
docker compose stop db
|
||
|
||
# The dev overlay: uncapped (no CPU limits). Default publish is 0.0.0.0:8137,
|
||
# right for a laptop-local rehearsal (e.g. phones on the same Wi-Fi) -- this is
|
||
# also the *fleet* dev environment's own overlay, but that environment now runs
|
||
# on vps1 (a public VPS, not a LAN box) and deploys via deploy/deploy-dev.sh,
|
||
# which overrides the bind address to the WireGuard mesh IP only
|
||
# (DEV_BIND_ADDR, see deploy/env-topology.sh) -- never invoke `make dev-up`
|
||
# directly on a fleet host, or it publishes on every interface. (The base file
|
||
# is prod/beta's shape: capped + loopback, fronted by their own Caddy LB.)
|
||
DEV_COMPOSE = docker compose -f docker-compose.yml -f docker-compose.dev.yml
|
||
dev-up:
|
||
POSTGRES_PASSWORD=$${POSTGRES_PASSWORD:-thermograph-dev} $(DEV_COMPOSE) up -d --build
|
||
|
||
dev-down:
|
||
$(DEV_COMPOSE) down
|
||
|
||
# Self-hosted Open-Meteo (prod-only overlay). Serves the ERA5 archive from object
|
||
# storage so the app is off the public archive API. See deploy/openmeteo/README.md
|
||
# for the object-storage bucket + rclone mount this expects on the host.
|
||
OM_COMPOSE = docker compose -f docker-compose.yml -f docker-compose.openmeteo.yml
|
||
om-up:
|
||
$(OM_COMPOSE) up -d --build
|
||
|
||
om-down:
|
||
$(OM_COMPOSE) down
|
||
|
||
# One-time historical backfill: write the full 1980→present archive (~1–1.5 TB of
|
||
# .om) to object storage. Runs each dataset once (no --repeat-interval), independent
|
||
# of the app/db, so it can run before the stack is flipped over. Hours-long.
|
||
OM_LAND_VARS = temperature_2m,dew_point_2m,precipitation,shortwave_radiation,wind_u_component_10m,wind_v_component_10m
|
||
OM_ERA5_VARS = wind_gusts_10m,temperature_2m,dew_point_2m,precipitation,shortwave_radiation,wind_u_component_10m,wind_v_component_10m
|
||
om-backfill:
|
||
$(OM_COMPOSE) run --rm --no-deps open-meteo-sync-land \
|
||
sync copernicus_era5_land $(OM_LAND_VARS) --past-days $${OM_BACKFILL_DAYS:-17000}
|
||
$(OM_COMPOSE) run --rm --no-deps open-meteo-sync-era5 \
|
||
sync copernicus_era5 $(OM_ERA5_VARS) --past-days $${OM_BACKFILL_DAYS:-17000}
|