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.
99 lines
3.7 KiB
Text
99 lines
3.7 KiB
Text
# /etc/thermograph.env — RENDERED BY TERRAFORM. Do not edit on the host; change the
|
|
# tfvars and re-apply. Read by `docker compose` (interpolation) and loaded into the
|
|
# app container (env_file in docker-compose.yml). Mirrors deploy/thermograph.env.example.
|
|
|
|
# Port uvicorn binds inside the container (compose publishes it on the host).
|
|
PORT=${app_port}
|
|
|
|
# --- PostgreSQL (docker-compose stack) ------------------------------------------
|
|
# Initializes the db container AND builds the app's THERMOGRAPH_DATABASE_URL.
|
|
POSTGRES_PASSWORD=${postgres_password}
|
|
# Provided explicitly for parity with the example; the app service also derives this
|
|
# from POSTGRES_PASSWORD in docker-compose.yml.
|
|
THERMOGRAPH_DATABASE_URL=${database_url}
|
|
|
|
# --- Container sizing (consumed by docker-compose.yml interpolation) -------------
|
|
# Terraform sizes the containers per host. Defaults in compose are 4 / 4 / 2 / 8g.
|
|
WORKERS=${workers}
|
|
APP_CPUS=${app_cpus}
|
|
DB_CPUS=${db_cpus}
|
|
DB_MEMORY=${db_memory}
|
|
# "latest-pg18" (the default) matches today's behavior. Pin an exact minor before
|
|
# any host of this stack could ever replicate with another (docker-compose.yml).
|
|
TIMESCALEDB_TAG=${timescaledb_tag}
|
|
%{ if openmeteo ~}
|
|
|
|
# --- Self-hosted Open-Meteo archive (docker-compose.openmeteo.yml) ---------------
|
|
# Host rclone mount of the ERA5 object-storage bucket; the overlay bind-mounts it
|
|
# into the Open-Meteo containers. THERMOGRAPH_ARCHIVE_URL is set by the overlay.
|
|
OM_DATA_DIR=${om_data_dir}
|
|
%{ endif ~}
|
|
|
|
# --- Serving --------------------------------------------------------------------
|
|
THERMOGRAPH_BASE=${base}
|
|
THERMOGRAPH_BASE_URL=${base_url}
|
|
# Secure cookie is only sent over HTTPS: 1 behind Caddy TLS, 0 on a plain-HTTP host.
|
|
THERMOGRAPH_COOKIE_SECURE=${cookie_secure}
|
|
|
|
# --- Auth -----------------------------------------------------------------------
|
|
# Signs email-confirm / password-reset tokens; pinned so links survive restarts.
|
|
THERMOGRAPH_AUTH_SECRET=${auth_secret}
|
|
|
|
# --- Web Push (VAPID) -----------------------------------------------------------
|
|
# Pinned so existing browser subscriptions keep receiving across restarts.
|
|
THERMOGRAPH_VAPID_PRIVATE_KEY=${vapid_private_key}
|
|
THERMOGRAPH_VAPID_PUBLIC_KEY=${vapid_public_key}
|
|
%{ if vapid_contact != "" ~}
|
|
THERMOGRAPH_VAPID_CONTACT=${vapid_contact}
|
|
%{ endif ~}
|
|
|
|
# --- SEO verification (optional) ------------------------------------------------
|
|
%{ if google_verify != "" ~}
|
|
THERMOGRAPH_GOOGLE_VERIFY=${google_verify}
|
|
%{ endif ~}
|
|
%{ if bing_verify != "" ~}
|
|
THERMOGRAPH_BING_VERIFY=${bing_verify}
|
|
%{ endif ~}
|
|
|
|
# --- Outbound email (optional) --------------------------------------------------
|
|
%{ if mail_backend != "" ~}
|
|
THERMOGRAPH_MAIL_BACKEND=${mail_backend}
|
|
%{ endif ~}
|
|
%{ if smtp_host != "" ~}
|
|
THERMOGRAPH_SMTP_HOST=${smtp_host}
|
|
%{ endif ~}
|
|
%{ if smtp_port != "" ~}
|
|
THERMOGRAPH_SMTP_PORT=${smtp_port}
|
|
%{ endif ~}
|
|
%{ if smtp_user != "" ~}
|
|
THERMOGRAPH_SMTP_USER=${smtp_user}
|
|
%{ endif ~}
|
|
%{ if smtp_password != "" ~}
|
|
THERMOGRAPH_SMTP_PASSWORD=${smtp_password}
|
|
%{ endif ~}
|
|
%{ if smtp_starttls != "" ~}
|
|
THERMOGRAPH_SMTP_STARTTLS=${smtp_starttls}
|
|
%{ endif ~}
|
|
%{ if mail_from != "" ~}
|
|
THERMOGRAPH_MAIL_FROM=${mail_from}
|
|
%{ endif ~}
|
|
%{ if mail_reply_to != "" ~}
|
|
THERMOGRAPH_MAIL_REPLY_TO=${mail_reply_to}
|
|
%{ endif ~}
|
|
|
|
# --- Discord (optional) ---------------------------------------------------------
|
|
%{ if discord_webhook != "" ~}
|
|
THERMOGRAPH_DISCORD_WEBHOOK=${discord_webhook}
|
|
%{ endif ~}
|
|
%{ if discord_public_key != "" ~}
|
|
THERMOGRAPH_DISCORD_PUBLIC_KEY=${discord_public_key}
|
|
%{ endif ~}
|
|
%{ if discord_app_id != "" ~}
|
|
THERMOGRAPH_DISCORD_APP_ID=${discord_app_id}
|
|
%{ endif ~}
|
|
%{ if discord_bot_token != "" ~}
|
|
THERMOGRAPH_DISCORD_BOT_TOKEN=${discord_bot_token}
|
|
%{ endif ~}
|
|
%{ if discord_client_secret != "" ~}
|
|
THERMOGRAPH_DISCORD_CLIENT_SECRET=${discord_client_secret}
|
|
%{ endif ~}
|