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.
143 lines
6.1 KiB
HCL
143 lines
6.1 KiB
HCL
# No project/region default here on purpose: each var.gcp_hosts entry carries its
|
|
# own project + zone (a fleet could span projects), and with var.gcp_hosts empty
|
|
# this provider is never invoked, so there's nothing to default. When you do
|
|
# populate var.gcp_hosts, authenticate via Application Default Credentials
|
|
# (`gcloud auth application-default login`) or GOOGLE_APPLICATION_CREDENTIALS --
|
|
# no credentials are configured in this repo.
|
|
provider "google" {}
|
|
|
|
locals {
|
|
# Repo root (one level above this terraform/ dir). The module hashes the compose
|
|
# files here so a compose change re-triggers the remote deploy, and this is the
|
|
# tree the host's checkout mirrors over git.
|
|
repo_root = abspath("${path.root}/..")
|
|
|
|
# Reusable size presets — a host can reference one by name (hosts.<name>.size)
|
|
# instead of hand-picking workers/app_cpus/db_cpus/db_memory separately. Mirrors
|
|
# the target Proxmox sizing-tier model (architecture doc §6: nano/small/medium/
|
|
# large -> {cores, mem}) ahead of actually provisioning VMs — Proxmox itself is
|
|
# deferred; today these tiers just size the container caps on the existing
|
|
# SSH-managed VPS hosts. "large" matches the current 48 GB prod box's numbers.
|
|
sizes = {
|
|
nano = { workers = 1, app_cpus = 1, db_cpus = 1, db_memory = "1g" }
|
|
small = { workers = 4, app_cpus = 4, db_cpus = 2, db_memory = "8g" }
|
|
medium = { workers = 6, app_cpus = 6, db_cpus = 3, db_memory = "12g" }
|
|
large = { workers = 8, app_cpus = 8, db_cpus = 4, db_memory = "16g" }
|
|
}
|
|
}
|
|
|
|
# GCP-created hosts (empty by default — see variables.tf and modules/gcp-host).
|
|
# Creates only the VM + minimal networking; every provisioning behavior comes from
|
|
# the SAME thermograph-host module every SSH-managed host below uses, via
|
|
# local.all_hosts merging its output IP in below. No live resources exist until
|
|
# var.gcp_hosts is populated.
|
|
module "gcp_vm" {
|
|
source = "./modules/gcp-host"
|
|
for_each = var.gcp_hosts
|
|
|
|
name = each.key
|
|
project = each.value.project
|
|
zone = each.value.zone
|
|
machine_type = each.value.machine_type
|
|
ssh_user = each.value.ssh_user
|
|
ssh_public_key_path = each.value.ssh_public_key_path
|
|
}
|
|
|
|
locals {
|
|
# ONE MODULE INSTANCE PER (HOST, ENVIRONMENT) PAIR, not per host.
|
|
#
|
|
# var.hosts is keyed by machine (vps1, vps2) and each machine carries an
|
|
# `environments` map, because vps2 runs prod AND beta. The module below
|
|
# provisions an ENVIRONMENT — a checkout, a branch, image tags, a Caddy site,
|
|
# container sizing — so it needs one instance per environment, with the two
|
|
# instances on vps2 sharing that machine's SSH identity.
|
|
#
|
|
# Flattened to keys like "vps2-prod" and "vps2-beta". Keeping them distinct
|
|
# module instances is what makes `app_dir` (required, no default in
|
|
# variables.tf) do its job: two environments on one box get two explicitly
|
|
# different checkouts, so neither apply can `git reset --hard` the other's
|
|
# tree.
|
|
ssh_environments = merge([
|
|
for hname, h in var.hosts : {
|
|
for ename, e in h.environments :
|
|
"${hname}-${ename}" => merge(e, {
|
|
host = h.host
|
|
ssh_user = h.ssh_user
|
|
ssh_private_key_path = h.ssh_private_key_path
|
|
})
|
|
}
|
|
]...)
|
|
|
|
# Every environment this config manages, SSH-only (flattened above) plus
|
|
# GCP-created (whose `host` is filled in from the VM Terraform just created) —
|
|
# one unified map so a single `module.host` for_each below handles both without
|
|
# duplicating any provisioning logic. GCP hosts stay one-entry-per-machine:
|
|
# nothing creates two environments on a created VM today, and the variable
|
|
# keeps its flat shape. They always use a named size tier (simpler than
|
|
# exposing the four raw sizing fields on that variable too).
|
|
all_hosts = merge(
|
|
local.ssh_environments,
|
|
{
|
|
for name, h in var.gcp_hosts : name => merge(h, {
|
|
host = module.gcp_vm[name].external_ip
|
|
workers = null
|
|
app_cpus = null
|
|
db_cpus = null
|
|
db_memory = null
|
|
openmeteo = false
|
|
om_data_dir = "/mnt/om-archive"
|
|
})
|
|
}
|
|
)
|
|
|
|
# Per-host resolved sizing: a named tier (host.size) wins when set; otherwise the
|
|
# host's own workers/app_cpus/db_cpus/db_memory fields (each individually
|
|
# defaulted in variables.tf) — so existing tfvars with explicit numbers are
|
|
# unaffected, and a tier is purely an opt-in shortcut.
|
|
host_sizing = {
|
|
for name, h in local.all_hosts : name => h.size != null ? local.sizes[h.size] : {
|
|
workers = h.workers
|
|
app_cpus = h.app_cpus
|
|
db_cpus = h.db_cpus
|
|
db_memory = h.db_memory
|
|
}
|
|
}
|
|
}
|
|
|
|
# One module instance per host (SSH-managed or GCP-created — see local.all_hosts).
|
|
# The module is entirely SSH-provisioner driven: it configures an already-running
|
|
# VM (however it came to exist) and hands the app off to docker compose.
|
|
module "host" {
|
|
source = "./modules/thermograph-host"
|
|
for_each = local.all_hosts
|
|
|
|
# Per-host config
|
|
name = each.key
|
|
host = each.value.host
|
|
ssh_user = each.value.ssh_user
|
|
ssh_private_key_path = each.value.ssh_private_key_path
|
|
role = each.value.role
|
|
git_branch = each.value.git_branch
|
|
backend_image_tag = each.value.backend_image_tag
|
|
frontend_image_tag = each.value.frontend_image_tag
|
|
domain = each.value.domain
|
|
compose_files = each.value.compose_files
|
|
app_dir = each.value.app_dir
|
|
workers = local.host_sizing[each.key].workers
|
|
app_cpus = local.host_sizing[each.key].app_cpus
|
|
db_cpus = local.host_sizing[each.key].db_cpus
|
|
db_memory = local.host_sizing[each.key].db_memory
|
|
timescaledb_tag = each.value.timescaledb_tag
|
|
openmeteo = each.value.openmeteo
|
|
om_data_dir = each.value.om_data_dir
|
|
|
|
# Shared infra config
|
|
repo_root = local.repo_root
|
|
repo_url = var.repo_url
|
|
app_port = var.app_port
|
|
|
|
# Shared object-storage config (only used where openmeteo = true)
|
|
om_bucket_remote = var.om_bucket_remote
|
|
om_rclone_conf = var.om_rclone_conf
|
|
om_vfs_cache_max = var.om_vfs_cache_max
|
|
}
|