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.
71 lines
3.7 KiB
Bash
Executable file
71 lines
3.7 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Provision a NAMED ENVIRONMENT to render secrets from the SOPS vault at deploy
|
|
# time. Idempotent; run once per environment (not once per box) as a
|
|
# sudo-capable user — vps2 carries two (prod AND beta), so it needs this run
|
|
# TWICE, each pointing SECRETS_ENV_FILE at that environment's own marker.
|
|
#
|
|
# SECRETS_ENV=prod AGE_KEY_SRC=/path/to/age.key bash deploy/provision-secrets.sh
|
|
# SECRETS_ENV=beta AGE_KEY_SRC=/path/to/age.key \
|
|
# SECRETS_ENV_FILE=/etc/thermograph/beta-secrets-env bash deploy/provision-secrets.sh
|
|
#
|
|
# Installs `sops` + `age` (idempotent, and shared across every environment on the
|
|
# box — one age key decrypts every deploy/secrets/<env>.yaml, since they're all
|
|
# encrypted to the same recipient), then installs the age PRIVATE key at
|
|
# /etc/thermograph/age.key (0400) and writes SECRETS_ENV_FILE (default
|
|
# /etc/thermograph/secrets-env — right for a single-environment host, dev
|
|
# included). After this, deploy.sh renders that environment's own
|
|
# /etc/thermograph*.env from deploy/secrets/*.yaml. See deploy/secrets/README.md.
|
|
#
|
|
# SECRETS_ENV_FILE only matters for a by-hand run with THERMOGRAPH_ENV unset:
|
|
# env-topology.sh's thermograph_env_name() falls back to reading it to decide
|
|
# which environment a bare `deploy.sh` means, and a host running two
|
|
# environments (vps2) cannot answer that from one shared marker — a by-hand
|
|
# deploy of beta there must export THERMOGRAPH_SECRETS_ENV_FILE to match
|
|
# whatever path this script wrote. CI-driven deploys pass THERMOGRAPH_ENV
|
|
# explicitly and never consult this file at all.
|
|
set -euo pipefail
|
|
|
|
SECRETS_ENV="${SECRETS_ENV:?set SECRETS_ENV=prod|beta|dev}"
|
|
AGE_KEY_SRC="${AGE_KEY_SRC:?set AGE_KEY_SRC=/path/to/the/age/private/key}"
|
|
# Where to write the env marker. Default matches the original, single-environment
|
|
# behavior; a SECOND environment on the same box (vps2's beta, alongside prod's
|
|
# default marker) must pass a distinct path so provisioning one can never
|
|
# overwrite the other's marker.
|
|
SECRETS_ENV_FILE="${SECRETS_ENV_FILE:-/etc/thermograph/secrets-env}"
|
|
SOPS_VERSION="${SOPS_VERSION:-v3.13.2}"
|
|
AGE_VERSION="${AGE_VERSION:-v1.3.1}"
|
|
BIN="${BIN:-/usr/local/bin}"
|
|
ARCH="$(uname -m)"; case "$ARCH" in x86_64) ARCH=amd64;; aarch64|arm64) ARCH=arm64;; esac
|
|
|
|
install_sops() {
|
|
command -v sops >/dev/null 2>&1 && { echo "==> sops already installed"; return; }
|
|
echo "==> Installing sops ${SOPS_VERSION}"
|
|
sudo curl -fsSL "https://github.com/getsops/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux.${ARCH}" -o "${BIN}/sops"
|
|
sudo chmod +x "${BIN}/sops"
|
|
}
|
|
|
|
install_age() {
|
|
command -v age >/dev/null 2>&1 && { echo "==> age already installed"; return; }
|
|
echo "==> Installing age ${AGE_VERSION}"
|
|
tmp="$(mktemp -d)"
|
|
curl -fsSL "https://github.com/FiloSottile/age/releases/download/${AGE_VERSION}/age-${AGE_VERSION}-linux-${ARCH}.tar.gz" | tar -xz -C "$tmp"
|
|
sudo install -m 0755 "$tmp/age/age" "$tmp/age/age-keygen" "$BIN/"
|
|
rm -rf "$tmp"
|
|
}
|
|
|
|
install_sops
|
|
install_age
|
|
|
|
echo "==> Installing age key -> /etc/thermograph/age.key (0400) and marker ${SECRETS_ENV_FILE} (${SECRETS_ENV})"
|
|
sudo mkdir -p /etc/thermograph "$(dirname "$SECRETS_ENV_FILE")"
|
|
sudo install -m 0400 "$AGE_KEY_SRC" /etc/thermograph/age.key
|
|
printf '%s\n' "$SECRETS_ENV" | sudo tee "$SECRETS_ENV_FILE" >/dev/null
|
|
sudo chmod 0644 "$SECRETS_ENV_FILE"
|
|
|
|
echo "==> Done. Verify: sops --version && ls -l /etc/thermograph/"
|
|
echo " Next: seed deploy/secrets/*.yaml, dry-run render, then deploy (see README)."
|
|
if [ "$SECRETS_ENV_FILE" != /etc/thermograph/secrets-env ]; then
|
|
echo " NOTE: non-default marker -- a by-hand deploy of ${SECRETS_ENV} on this box"
|
|
echo " must export THERMOGRAPH_SECRETS_ENV_FILE=${SECRETS_ENV_FILE} (CI-driven"
|
|
echo " deploys pass THERMOGRAPH_ENV explicitly and never consult this file)."
|
|
fi
|