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>
47 lines
1.5 KiB
Caddyfile
47 lines
1.5 KiB
Caddyfile
# BRouter Caddy sidecar.
|
|
#
|
|
# Role: enforce the X-BRouter-Auth shared-secret header so the exposed
|
|
# vSwitch port can only be used by the Planner, not by any other process
|
|
# that happens to land on the private network.
|
|
#
|
|
# Note on auth hygiene: by default, Caddy's access log does NOT include
|
|
# request headers, so the token value is not written to disk. If you
|
|
# ever enable `log { format json }` with `fields_exclude`, make sure
|
|
# `X-BRouter-Auth` is NOT added to the log's request headers set.
|
|
{
|
|
# Bind admin socket to localhost only (default behavior, explicit here
|
|
# as defense-in-depth).
|
|
admin localhost:2019
|
|
# Don't attempt TLS — we only listen on the private vSwitch and
|
|
# terminate plain HTTP on :17777. No certs, no Let's Encrypt, no
|
|
# leakage of this hostname to the ACME CAs.
|
|
auto_https off
|
|
}
|
|
|
|
:17777 {
|
|
# Match requests carrying the correct shared secret.
|
|
@authed header X-BRouter-Auth {$BROUTER_AUTH_TOKEN}
|
|
|
|
handle @authed {
|
|
reverse_proxy brouter:17777 {
|
|
# Don't forward the auth header upstream — BRouter doesn't
|
|
# use it, and it's cleaner to contain the credential at
|
|
# the proxy boundary.
|
|
header_up -X-BRouter-Auth
|
|
}
|
|
}
|
|
|
|
# Everything else: blunt 403.
|
|
handle {
|
|
respond "Forbidden" 403
|
|
}
|
|
|
|
# Access log to stdout (structured JSON). Container logs are captured
|
|
# by Docker's json-file driver and shipped to Loki by the promtail
|
|
# sidecar. Header values are NOT logged unless explicitly configured.
|
|
log {
|
|
output stdout
|
|
format json
|
|
}
|
|
}
|