c41ade74b1
* Split web/worker duties with THERMOGRAPH_ROLE Background work (the subscription notifier) is welded to the same process that serves requests, so scaling the web tier to N replicas would also scale notifier instances unless something restricts it further than leader election alone. Add THERMOGRAPH_ROLE (web|worker|all, default all - unchanged single-process behavior). Every replica runs the same image; ROLE only gates whether a process is allowed to own the notifier at all, layered on top of the existing leader election: web replicas never start it even if they'd win leader election, worker replicas start it if they win. The decision is pulled into _should_run_notifier() so it's unit-testable without booting the full app (DB init, places index, neighbor warmer). Add a minimal /healthz liveness route (no DB/upstream I/O, not under BASE) so a worker replica - which serves no real traffic - still has something Swarm can health-check. * Add the Swarm interim stack file, a pinnable TimescaleDB tag, and a Caddy health-gate Three changes toward the hop-1 interim cutover, all inert until Track B stands up the platform: docker-stack.yml: the Swarm stack file for the interim cutover, distinct from docker-compose.yml (today's plain-compose deploy, unaffected). Pulls a pre-built image (IMAGE_TAG) instead of building in place; app/worker publish no host port (127.0.0.1:8137:8137 has no Swarm equivalent - Swarm's routing mesh publishes on 0.0.0.0, which would expose the plaintext app un-fronted), reaching Caddy only over an MTU-lowered overlay network (VXLAN-over-WireGuard needs a smaller MTU or large payloads silently stall); db is placement- pinned to a labelled node; app/worker skip inline migrations (RUN_MIGRATIONS=0) so the runbook's one-shot migrate task is the only thing that ever runs Alembic; secrets are real Swarm secrets mounted at /run/secrets, read by the entrypoint shim rather than plain env vars. TIMESCALEDB_TAG: docker-compose.yml's db image now reads this (default latest-pg18, today's behavior unchanged), wired through Terraform (timescaledb_tag, default "latest-pg18") so it can actually be pinned to an exact minor without hand-editing the host - required before any host of the stack could replicate with another (a floating tag risks mismatched extension minors, which blocks a physical replica and risks compressed- chunk corruption on restore). Caddy active health-gate: both the Terraform-rendered Caddyfile and the live deploy/Caddyfile now health-check the app on the same cheap /healthz route its own Docker HEALTHCHECK uses (now /healthz instead of the SSR homepage, so it's cheap enough for a tight interval and works identically for a worker replica, which serves no public traffic at all) - Caddy won't forward into a container that's still booting or unhealthy. Verified live: built and booted the real image via docker compose - both containers report healthy via the new /healthz-based HEALTHCHECK, and GET / still renders the full SSR homepage unchanged. Both Caddyfiles validated with the real caddy binary. docker-stack.yml validated with docker compose config (required-var guards fire with clear messages; secrets correctly mount at /run/secrets/<name>, matching the entrypoint shim's mapping). docker-compose.yml validated with and without TIMESCALEDB_TAG set, alongside the existing openmeteo overlay. terraform validate + fmt clean.
75 lines
2.6 KiB
Caddyfile
75 lines
2.6 KiB
Caddyfile
# /etc/caddy/Caddyfile on the VPS.
|
|
# Each domain's A/AAAA record must already point at this VPS — Caddy provisions a
|
|
# Let's Encrypt cert on first request and auto-renews. Nothing else to do for TLS
|
|
# (just make sure ports 80 and 443 are open).
|
|
#
|
|
# Layout:
|
|
# thermograph.org/* -> the Thermograph app (reverse-proxied to uvicorn)
|
|
# emigriffith.dev/ -> static portfolio site (served straight from disk)
|
|
# emigriffith.dev/thermograph* -> permanent redirect to thermograph.org (the app moved)
|
|
#
|
|
# Thermograph now owns thermograph.org's root, so it must run with
|
|
# THERMOGRAPH_BASE=/ (see /etc/thermograph.env) — the app serves its pages, assets
|
|
# and API at "/" with no sub-path prefix. One uvicorn on 127.0.0.1:8137 backs both
|
|
# thermograph.org (proxied) and the emigriffith.dev redirect.
|
|
|
|
thermograph.org {
|
|
encode zstd gzip
|
|
|
|
# The app serves everything at the root now (THERMOGRAPH_BASE=/).
|
|
# Active health check on the same cheap /healthz route the container's own
|
|
# HEALTHCHECK uses (Dockerfile) — so a deploy that's still restarting/booting
|
|
# never gets proxied into (a reload alone has no gate, hop-1 runbook hazard #10).
|
|
reverse_proxy 127.0.0.1:8137 {
|
|
health_uri /healthz
|
|
health_interval 5s
|
|
health_timeout 3s
|
|
health_status 2xx
|
|
}
|
|
|
|
log {
|
|
output file /var/log/caddy/thermograph.log
|
|
}
|
|
}
|
|
|
|
emigriffith.dev {
|
|
encode zstd gzip
|
|
|
|
# Thermograph moved to its own domain. Send the old sub-path there with a
|
|
# permanent redirect, stripping the /thermograph prefix so deep links map
|
|
# straight across (…/thermograph/calendar -> thermograph.org/calendar). The
|
|
# bare /thermograph (no trailing slash) goes to the new root.
|
|
handle_path /thermograph/* {
|
|
redir https://thermograph.org{uri} permanent
|
|
}
|
|
handle /thermograph {
|
|
redir https://thermograph.org/ permanent
|
|
}
|
|
|
|
# Portfolio at the root. Point `root` at the built static site (for the Astro
|
|
# portfolio that's its `dist/` output). file_server serves index.html for
|
|
# directories and returns a real 404 for missing paths.
|
|
handle {
|
|
root * /var/www/emigriffith
|
|
file_server
|
|
}
|
|
|
|
log {
|
|
output file /var/log/caddy/emigriffith.log
|
|
}
|
|
}
|
|
|
|
# Old bookmarks to the raw IP (the pre-domain URL) would otherwise get bounced to
|
|
# HTTPS-on-the-IP, which has no cert and fails. Redirect them to the portfolio domain.
|
|
http://75.119.132.91 {
|
|
redir https://emigriffith.dev{uri} permanent
|
|
}
|
|
|
|
# Optional: redirect www -> apex for either domain. Add the www CNAME/A record
|
|
# first, then uncomment the matching block.
|
|
# www.emigriffith.dev {
|
|
# redir https://emigriffith.dev{uri} permanent
|
|
# }
|
|
# www.thermograph.org {
|
|
# redir https://thermograph.org{uri} permanent
|
|
# }
|