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.
7.3 KiB
ops/ — operator + agent query tooling
Read-only query access to Thermograph data, uniform across environments.
dbq.sh — Postgres, any environment
infra/ops/dbq.sh dev "select count(*) from climate_history"
infra/ops/dbq.sh prod -tA -c "select max(date) from climate_history"
infra/ops/dbq.sh beta -c '\dt'
echo "select 1" | infra/ops/dbq.sh prod -f -
Environments: dev (own compose stack + own Postgres container, on vps1,
75.119.132.91), beta and prod (both on vps2, 169.58.46.181 — separate
roles/databases on the ONE shared TimescaleDB instance there). Host, SSH
target and container filter all come from deploy/env-topology.sh now, never
a hardcoded table — dbq.sh SSHes to vps1 for dev and to vps2 for
beta/prod, and beta (which has no db container of its own) resolves
prod's shared thermograph_db task. Extra args pass straight through to
psql (-tA, -x, --csv, -f, …); stdin is forwarded.
Known gap: beta has no read-only role of its own yet — deploy/db/provision-env-db.sh
only provisions the environment's owning role (thermograph_beta), so a
dbq.sh beta query connects as thermograph_beta (which can write) rather
than a read-only role, unlike dev/prod. See dbq.sh's own header for the
tracked follow-up (a thermograph_beta_ro role).
Why it execs into the container instead of using a connection string
None of the databases are exposed over TCP — each listens only on its private
docker network. Prod's and beta's is a Swarm overlay (thermograph_internal)
that the vps2 host itself cannot route to, so ssh -L is impossible for
either of them — treat beta exactly like prod here, now that it's a Swarm
service too, not the compose-network exception it used to be. Publishing 5432
would mean new ufw rules plus a Swarm endpoint change on a live environment.
Running psql inside the db container works identically in all three
environments with no ports, no tunnels, and no infra changes.
The prod container name is a Swarm task name that changes on every redeploy, so
it is resolved at call time via docker ps --filter name=…, never hardcoded.
Safety
dev and prod connect as thermograph_ro — a NOSUPERUSER role granted
only pg_read_all_data. Read-only is enforced by Postgres, not by convention:
$ infra/ops/dbq.sh prod -c "create table t(i int)"
ERROR: permission denied for schema public
beta is the exception, today: deploy/db/provision-env-db.sh only ever
provisions the environment's owning role (thermograph_beta —
NOSUPERUSER/NOCREATEDB/NOCREATEROLE, but it owns its own database and
schema) and revokes CONNECT from PUBLIC on thermograph_beta, so
thermograph_ro was never granted CONNECT there. A dbq.sh beta query
therefore connects as thermograph_beta until a beta-scoped read-only role
exists (tracked in dbq.sh's own header as a TODO) — it can write to beta's
database, though never to prod's.
The app's own thermograph role is a superuser and is deliberately not used
by this tool. If thermograph_ro is ever missing (fresh instance), recreate it with:
CREATE ROLE thermograph_ro LOGIN;
GRANT CONNECT ON DATABASE thermograph TO thermograph_ro;
GRANT pg_read_all_data TO thermograph_ro;
iceberg.sh — the Iceberg lake, any environment
infra/ops/iceberg.sh dev -c "show tables"
infra/ops/iceberg.sh prod -c "select count(*) from era5_daily"
infra/ops/iceberg.sh beta -json -c "select * from era5_daily limit 3"
echo "select 1" | infra/ops/iceberg.sh prod -f -
Same environments and argument shape as dbq.sh (spec:
ICEBERG-HANDOFF.md). Extra args pass straight
through to the duckdb CLI (-json, -csv, -line, -c, -f, …); with
-f -, stdin is forwarded and read as piped SQL; a single bare argument is
treated as -c SQL.
Why an ephemeral DuckDB container instead of a query service
The lake is one shared warehouse in Contabo object storage
(s3://era5-thermograph/iceberg), reachable from every environment with the
same credentials — so unlike Postgres there is no per-env database to reach,
and the environments differ only in where the engine runs: a throwaway
docker run of a small DuckDB image (duckdb CLI + httpfs/iceberg
extensions pre-installed) on the target box — vps1 for dev, vps2 for
beta/prod, resolved from deploy/env-topology.sh rather than a hardcoded
table (beta and prod are two Swarm stacks on the same vps2 box now). The
image is built on the host the first time it's needed from a Dockerfile
embedded in the script; its tag is a hash of that Dockerfile, so editing the
script rolls every host forward on the next call.
A container per query means no daemon, no listening port, no tunnel (beta's
and prod's Swarm overlay cannot be tunnelled), no firewall or Swarm changes —
sudo ss -ltnp is identical before and after a query. It also never execs
into an app container and resolves no container names, so a redeploy can't
break it.
There is no catalog service to run or expose: an Iceberg table's current
state is fully described by the newest metadata JSON under
<warehouse>/<table>/metadata/. iceberg.sh resolves that at call time
(numeric metadata version, newest wins) and exposes each table directory as a
view of the same name — which is also how it keeps reading fresh snapshots of
a table that is still being loaded.
Credentials are resolved at call time and never stored in the repo: the
target host's /etc/thermograph.env (THERMOGRAPH_LAKE_S3_*) wins if
present; otherwise the calling machine decrypts the SOPS vault
(infra/deploy/secrets/prod.yaml) and hands the two values to the remote
shell over stdin — never argv, so never visible in ps, and never written to
a file on the target.
Safety
Every session locks itself down before user SQL runs:
SET allowed_directories=['s3://era5-thermograph/iceberg/', 's3://era5-thermograph/era5/'];
SET enable_external_access=false;
SET lock_configuration=true;
Both prefixes are required for reads: era5_daily was built with pyiceberg
add_files over the existing hive parquet, so its metadata lives under
iceberg/ while its data files stay in place under era5/daily/. DuckDB
itself then refuses everything else — the live backups/ prefix, all local
files — and the lockdown cannot be SET away by query text:
$ infra/ops/iceberg.sh prod -c "COPY (SELECT 1) TO 's3://era5-thermograph/backups/x.csv'"
Permission Error: Cannot access file "s3://era5-thermograph/backups/x.csv" - file system operations are disabled by configuration
$ infra/ops/iceberg.sh dev -c "SET enable_external_access=true"
Invalid Input Error: Cannot change configuration option "enable_external_access" - the configuration has been locked
Known gap: the only provisioned keypair for the bucket is read-write, so
a raw COPY TO targeting a path inside the two allowed prefixes is not
refused — the DuckDB iceberg extension cannot write Iceberg tables, but it
could still clobber raw objects under iceberg/ or era5/. Path-based
restriction cannot both allow reading a prefix and forbid writing it; closing
the gap needs a scoped read-only keypair (the object-storage equivalent of
thermograph_ro). When the operator mints one, render it as
THERMOGRAPH_LAKE_S3_* on the hosts or swap it into the vault —
iceberg.sh needs no code change.