diff --git a/README.md b/README.md index 3faf03a..0826c1a 100644 --- a/README.md +++ b/README.md @@ -149,14 +149,17 @@ it, asking through each, and removing all of it afterwards. by convention: `forgeway.services.falkvinge.net` is NXDOMAIN on public DNS and answers only on the internal `.201` resolvers, so an entry that *loads* proves HA resolved it internally. HA lives on the sandbox VLAN, which cannot reach the k8s ingress by default; -Rick opened `192.168.120.12 → 172.19.10.11` on pfSense (HA's IP only — the neighbouring -scripthost still cannot connect, as intended). Both entries loaded and answered after -that, which is the proof the rule works. +**Rick added a pfSense rule** passing HA (`192.168.120.12`) to the ingress `172.19.10.11` +(HA's IP only — the neighbouring scripthost still cannot connect). Both entries loaded +and answered after that; the ingress access log shows HA's own client +(`ollama-python/0.6.2 (aarch64 linux)`) posting to both endpoints. -**The alternative path**, kept as a documented fallback: `forgeway.dmz.lounge.falkvinge.net` -goes through the entrance HAProxy (`172.20.0.101` → `172.19.10.90:80`), fenced to RFC1918 -sources because that edge is public. It was HA's route before the pfSense rule existed -and needs no rule; it is not used by either entry now. +There is deliberately **no path through the entrance HAProxy any more.** A fenced vhost +(`forgeway.dmz.lounge.falkvinge.net`) existed for a few hours on 2026-09-18 while HA could +not reach the ingress; Rick chose the pfSense rule instead, and a public-edge listener in +front of an unauthenticated service must not survive by accident. The vhost, the DNS +record and the Ingress host are all removed, verified from outside (the hostname now falls +to the edge's default backend). **What HA sends and how it is handled.** `list()` → `/api/tags` with a 5 s timeout, so tags never wait on a model load (a cold `gpt-oss:120b` takes ~25–30 s); the list is @@ -227,7 +230,6 @@ at the Lounge nothing special is needed: ``` forgeway.services.falkvinge.net → ingress.dmz.lounge.falkvinge.net → 172.19.10.11 forgeway.lounge.falkvinge.net → ingress.dmz.lounge.falkvinge.net → 172.19.10.11 -forgeway.dmz.lounge.falkvinge.net → entrance.dmz.falkvinge.net → 172.20.0.101 (HAProxy path, see Home Assistant) forgeway.serenity.falkvinge.net → forgeway.dmz.serenity.falkvinge.net → ingress.dmz.serenity.falkvinge.net → 172.24.10.11 ``` diff --git a/REPORT.md b/REPORT.md index d37f632..dec8122 100644 --- a/REPORT.md +++ b/REPORT.md @@ -414,3 +414,48 @@ on forge was never touched. - Default assistant: *Settings → Voice assistants → Assist → Conversation agent*. - Device control: tick *Control Home Assistant* on a subentry (deliberately off). - Cosmetic: rename the optimistic subentry "Forge Conversation" in the UI. + +--- + +# Addendum 4, 2026-09-18 night — converged on the approved design + +Rick approved: pfSense rule for HA, drop the entrance vhost. State was re-established +with evidence before acting, then converged. **Who did what:** + +| | Done by | Evidence | +|---|---|---| +| pfSense rule `192.168.120.12 → 172.19.10.11` | **Rick** (his statement; I could not add or even read it — the magpie jump to pfSense is down, `ssh -p 2222` refused) | both HA entries on the alias load and answer; the scripthost on the same VLAN still cannot connect (rule is HA-IP-scoped) | +| Entrance HAProxy vhost | **me**: added earlier today, **removed now** — `lounge-haproxy-config` `73f4389`, applied by the autopull at 19:05:07 UTC | before: outside vantage (Serenity's public egress → Lounge WAN) got the 403 fence; after: nginx 404 from the default backend; the `git` control vhost answered 200 on every 10 s tick through the change — no blip | +| `forgeway.dmz.lounge.falkvinge.net` (DNS + Ingress host) | **me**: created for the edge path, **retired now** (`lounge-cluster-config` `b77c0d1`) | authoritative answer empty; live Ingress hosts = `forgeway.services` + `forgeway.lounge` | +| HA entries on the alias | optimistic entry created on **Rick's side** (I renamed entry/device/entity); strict entry created by **me** | see below | + +## HA end state, proven after the vhost was gone + +| Agent (dropdown) | Entity | Server URL | Real conversation after 19:05:07 | +|---|---|---|---| +| **Local only — private (fails if forge is down)** | `conversation.forgeway_local_only` | `https://forgeway.services.falkvinge.net/local-strict` | *"Home Assistant is an open-source platform that lets you automate and control smart-home devices from a single interface."* (73 s) | +| **Local preferred — falls back to OpenAI cloud** | `conversation.forgeway_local_preferred` | `https://forgeway.services.falkvinge.net/local-optimistic` | *"Home Assistant is a home automation platform that lets you control and automate smart devices locally."* (25 s) | + +The ingress-nginx access log attributes these to HA by its client signature +`ollama-python/0.6.2 (aarch64 linux) Python/3.14.6` (HA Yellow; every test of mine is +curl or x86_64), posting to `/local-strict/api/chat` and `/local-optimistic/api/chat` +against upstream service `forgeway-forgeway-80`: + +``` +19:06:25 UTC POST /local-strict/api/chat -> 200 (73.3 s) conversation.forgeway_local_only +19:06:50 UTC POST /local-optimistic/api/chat -> 200 (24.6 s) conversation.forgeway_local_preferred +``` + +(A third HA-originated optimistic conversation completed at 19:05:27; not one I +started.) With the edge vhost gone, the ingress is the only route a `.services.` name has. + +**Strict genuinely fails when forge is unavailable — re-proven through HA** with a +throwaway dead-upstream instance published under a temporary `.services.` name: the +strict temp agent produced no answer and no cloud call (HA raised its Ollama error; REST +surface HTTP 500), the optimistic temp agent answered in 1.3 s with the router logging +*falling back to cloud gpt-5.4-mini*. Temporaries (HA entries, Ingress, Service, +Deployment, DNS record) removed; the namespace holds only forgeway. Ollama on forge +was never touched. + +Nothing is left for Rick unless he wants the optional bits from Addendum 3 (default +assistant, device control, cosmetic subentry rename).