c49047fd33
Lands sections 3-5 of the relocate-brouter-to-dedicated-host change:
everything needed to run BRouter on the dedicated Hetzner Robot host
and have the Planner talk to it with the shared-secret header. Does
NOT flip the cutover — the flagship BRouter stays warm during soak.
## BRouter host compose (section 3)
New `infrastructure/brouter-host/` — a standalone compose project that
runs as the `trails` user on `ullrich.is`:
- `docker-compose.yml` — brouter + caddy sidecar. BRouter has no host
port; caddy binds only to `10.0.1.10:17777` (vSwitch IP). Every
service explicitly overrides the host's default Loki logging driver
to `json-file` so logs don't leak to the operator's personal Loki.
- `Caddyfile` — single-purpose reverse proxy that requires
`X-BRouter-Auth: ${BROUTER_AUTH_TOKEN}` on every request. `auto_https
off` (vSwitch-only); default access log format omits request
headers, so the token is never written to disk.
- `download-segments.sh` — crawls brouter.de, pulls planet-wide RD5
tiles via `wget -N` (incremental). Idempotent, safe to cron.
- `README.md` — one-shot provisioning + token rotation + rollback
notes.
`docker/brouter/Dockerfile` is patched to honor `JAVA_OPTS` (was
hardcoded `-Xmx1024M` in CMD). Default keeps the flagship's current
heap; compose on the dedicated host overrides to `-Xmx8g` for planet
scale on a 32 GB box.
## Planner shared-secret header (section 4)
`apps/planner/app/lib/brouter.ts`:
- Module-level guard: throws at startup in production if
`BROUTER_AUTH_TOKEN` is unset.
- `authHeaders()` helper (reads env at call time, so tests can
`vi.stubEnv` without module reset).
- Header attached on both `computeRoute` (per-segment) and
`computeSegmentGpx`.
3 new unit tests cover header attachment + the no-token path.
`infrastructure/docker-compose.yml` passes `BROUTER_AUTH_TOKEN` to
the Planner service, and makes `BROUTER_URL` overridable via SOPS so
the cutover is a one-variable flip.
## cd-brouter workflow (section 5)
Rewritten to deploy to the dedicated host:
- SSH as `trails@${BROUTER_DEPLOY_HOST}` on port
`${BROUTER_DEPLOY_SSH_PORT}` (2232) using
`${BROUTER_DEPLOY_SSH_KEY}`.
- Decrypts SOPS, extracts ONLY `BROUTER_AUTH_TOKEN` into a `.env`
file, scp'd alongside the compose project.
- `paths:` trigger now includes `infrastructure/brouter-host/**`.
- Segment download is NOT run here — first-time seed is a manual
operator step (multi-hour). Routine re-runs are cron-able on the
dedicated host.
- Grafana annotation step preserved (reaches flagship Grafana as
before).
## What's NOT here
- `brouter:` service on the flagship is intentionally left in place
(removed in section 7.5 after the 48 h soak window post-cutover).
- Observability (section 6) — Prometheus scrape + Loki shipping from
the dedicated host — comes in a follow-up PR.
- Cutover itself (section 7) — flip `BROUTER_URL`, verify, remove the
flagship brouter — is an operator action gated on first-time
provisioning + smoke testing.
## Verification
`pnpm typecheck && pnpm lint && pnpm test` all clean; planner build
passes (the CI regression from #286 was fixed in #290).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
78 lines
2.4 KiB
YAML
78 lines
2.4 KiB
YAML
# BRouter host compose project — runs on the dedicated Hetzner Robot
|
|
# server `ullrich.is` under the `trails` user. See README.md for first-time
|
|
# provisioning notes.
|
|
#
|
|
# Exposed surface: Caddy listens on 10.0.1.10:17777 (vSwitch IP only).
|
|
# BRouter itself is not published to the host — only reachable via the
|
|
# internal Docker network from the Caddy sidecar.
|
|
#
|
|
# Logging: the host's default logging driver is `loki` (user's personal
|
|
# Loki). Every service here explicitly overrides to `json-file` so logs
|
|
# stay local and are picked up by the promtail sidecar (section 6.3) for
|
|
# shipping to trails.cool's Loki.
|
|
|
|
services:
|
|
brouter:
|
|
image: ghcr.io/trails-cool/brouter:latest
|
|
container_name: trails-brouter
|
|
restart: unless-stopped
|
|
# Planet-scale coverage: segments live on the host and are mounted in.
|
|
# 8 GB heap for segment cache; -Xms generous because routing is
|
|
# memory-heavy and we don't benefit from a slow JVM warmup.
|
|
environment:
|
|
JAVA_OPTS: "-Xmx8g -Xms512M"
|
|
volumes:
|
|
- ./segments:/data/segments:ro
|
|
networks:
|
|
- trails-brouter-internal
|
|
# Scope logs to json-file so we don't leak to the host's default Loki
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "3"
|
|
labels:
|
|
trails.cool.service: "brouter"
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "wget -q -O- http://localhost:17777/ >/dev/null 2>&1 || exit 1"]
|
|
interval: 30s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 60s
|
|
|
|
caddy:
|
|
image: caddy:2-alpine
|
|
container_name: trails-brouter-caddy
|
|
restart: unless-stopped
|
|
depends_on:
|
|
brouter:
|
|
condition: service_healthy
|
|
# Bind ONLY to the vSwitch IP on the host — the dedicated host's
|
|
# public IP remains unaffected. UFW further restricts this to traffic
|
|
# sourced from the flagship's private IP (10.0.0.2).
|
|
ports:
|
|
- "10.0.1.10:17777:17777"
|
|
environment:
|
|
BROUTER_AUTH_TOKEN: ${BROUTER_AUTH_TOKEN:?BROUTER_AUTH_TOKEN must be set}
|
|
volumes:
|
|
- ./Caddyfile:/etc/caddy/Caddyfile:ro
|
|
- caddy-data:/data
|
|
- caddy-config:/config
|
|
networks:
|
|
- trails-brouter-internal
|
|
logging:
|
|
driver: json-file
|
|
options:
|
|
max-size: "10m"
|
|
max-file: "3"
|
|
labels:
|
|
trails.cool.service: "brouter-caddy"
|
|
|
|
volumes:
|
|
caddy-data:
|
|
caddy-config:
|
|
|
|
networks:
|
|
trails-brouter-internal:
|
|
driver: bridge
|
|
# Container-to-container only; no host-level exposure via this net
|