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.
43 lines
1.9 KiB
Bash
Executable file
43 lines
1.9 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Locks the Swarm ports (2377 control, 7946 gossip, 4789 overlay VXLAN) to the
|
|
# WireGuard interface only — they must never be reachable from the public
|
|
# internet. Run on ALL THREE nodes (vps2, vps1, desktop) after joining the
|
|
# swarm. Existing app-facing rules (80/443, SSH, etc.) are untouched.
|
|
set -euo pipefail
|
|
|
|
WG_IFACE="${WG_IFACE:-wg0}"
|
|
|
|
if ! command -v ufw >/dev/null 2>&1; then
|
|
echo "ufw not found — apply the equivalent iptables/nftables rules by hand:" >&2
|
|
echo " allow 2377/tcp, 7946/tcp, 7946/udp, 4789/udp only on interface ${WG_IFACE}" >&2
|
|
echo " deny 2377/tcp, 7946/tcp, 7946/udp, 4789/udp on every other interface" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "==> Allowing Swarm ports on ${WG_IFACE} only"
|
|
ufw allow in on "$WG_IFACE" to any port 2377 proto tcp
|
|
ufw allow in on "$WG_IFACE" to any port 7946 proto tcp
|
|
ufw allow in on "$WG_IFACE" to any port 7946 proto udp
|
|
ufw allow in on "$WG_IFACE" to any port 4789 proto udp
|
|
|
|
echo "==> Explicitly denying the same ports on every other interface"
|
|
ufw deny 2377/tcp
|
|
ufw deny 7946/tcp
|
|
ufw deny 7946/udp
|
|
ufw deny 4789/udp
|
|
|
|
echo
|
|
echo "Rules added (not yet necessarily active — check ufw status):"
|
|
ufw status numbered | grep -E "2377|7946|4789|Status" || true
|
|
echo
|
|
if ! ufw status | grep -q "^Status: active"; then
|
|
echo "ufw is currently INACTIVE on this node — 'ufw enable' switches its"
|
|
echo "default policy to deny-incoming for EVERYTHING, not just the Swarm"
|
|
echo "ports above. Before enabling, explicitly allow every port this node"
|
|
echo "already serves publicly (SSH at minimum; on vps2 specifically, also"
|
|
echo "80/tcp and 443/tcp for the live thermograph.org/beta.thermograph.org"
|
|
echo "Caddy; on vps1, 80/tcp and 443/tcp for git.thermograph.org,"
|
|
echo "dashboard.thermograph.org and emigriffith.dev) — check 'ss -tlnp' for"
|
|
echo "what's actually listening first. Enabling ufw without doing this WILL"
|
|
echo "drop live traffic the moment it activates."
|
|
fi
|