diff --git a/docs/gateway.md b/docs/gateway.md index 1c59997a..ba28f942 100644 --- a/docs/gateway.md +++ b/docs/gateway.md @@ -200,13 +200,20 @@ dashboard reach by design — the surface is privileged (approve / deny / destroy) and must not be exposed without a real reverse proxy in front. -## `HIVE_FORGE_URL`: loopback for in-cluster, sub-domain for the operator +## `HIVE_FORGE_URL`: bridge gateway for isolated agents, loopback for shared-netns Agents poll `HIVE_FORGE_URL` for Forgejo notifications + run all -`hive-forge` calls against it. `hive-c0re.nix` pins this to -`http://127.0.0.1:` for the in-cluster path: every -agent container shares the host's network namespace, so loopback -reaches the forge container directly with no DNS lookup needed. +`hive-forge` calls against it. `hive-c0re.nix` sets this based on the +network isolation mode: + +- **`network.isolateContainers = true`**: agents run in private netns, + so host loopback is unreachable. `HIVE_FORGE_URL` is set to + `http://:`. Forgejo binds `0.0.0.0` so it's + reachable at the bridge gateway IP. `hive-network.nix` opens + `forge.httpPort` on the bridge interface automatically. +- **`network.isolateContainers = false`** (default): agents share the host's + network namespace, so loopback reaches forgejo directly. `HIVE_FORGE_URL` + is `http://127.0.0.1:`. The sub-domain default (`forge.`) is for **operator browsers + cross-host clients**, not in-cluster traffic. Using the diff --git a/docs/network.md b/docs/network.md index 1b74a7e3..b5f928d7 100644 --- a/docs/network.md +++ b/docs/network.md @@ -108,6 +108,8 @@ agent containers from shared host netns to private netns. Set only after | IP forwarding | `boot.kernel.sysctl."net.ipv4.ip_forward" = 1` | | Internet NAT | `networking.nat { enable = true; internalInterfaces = [ bridgeName ]; }` — MASQUERADE on packets leaving via any external NIC | | Loopback DROP | `networking.firewall.extraInputRules` — drops bridge-subnet → `127.0.0.0/8` traffic; defence-in-depth against routing table leaks | +| Forge access | `networking.firewall.interfaces..allowedTCPPorts` — opens `forge.httpPort` on the bridge interface so isolated agents can reach forgejo at `:` | +| Forge URL | `HIVE_FORGE_URL` flips from `http://127.0.0.1:3000` to `http://:3000` — forwarded to containers via meta flake | | c0re signal | `HIVE_NETWORK_ISOLATION=1`, `HIVE_NETWORK_BRIDGE`, `HIVE_NETWORK_SUBNET` in `systemd.services.hive-c0re.environment` | `HIVE_NETWORK_SUBNET` is the host-side bridge IP + prefix (e.g. diff --git a/nix/modules/hive-c0re.nix b/nix/modules/hive-c0re.nix index 7b89f221..c56d717d 100644 --- a/nix/modules/hive-c0re.nix +++ b/nix/modules/hive-c0re.nix @@ -557,12 +557,19 @@ in HYPERHIVE_SWARM_NAME = config.services.hyperhive.swarmName; } // lib.optionalAttrs config.services.hyperhive.forge.enable { - # Loopback for in-cluster calls (agents share host netns; - # external `forge.` sub-domain isn't DNS-resolvable - # from inside nspawn). See - # `docs/gateway.md::HIVE_FORGE_URL: loopback for in-cluster, - # sub-domain for the operator`. - HIVE_FORGE_URL = "http://127.0.0.1:${toString config.services.hyperhive.forge.httpPort}"; + # In-cluster forge URL. When containers are isolated (private netns), + # 127.0.0.1 is the container's own loopback — unreachable for host + # services. Use the bridge gateway IP instead; forgejo binds 0.0.0.0 + # so it's reachable there. Shared-netns mode keeps loopback path. + # External `forge.` sub-domain isn't DNS-resolvable from inside + # nspawn either way. See `docs/gateway.md::HIVE_FORGE_URL`. + HIVE_FORGE_URL = + if + config.services.hyperhive.network.enable && config.services.hyperhive.network.isolateContainers + then + "http://${config.services.hyperhive.network.bridgeIp}:${toString config.services.hyperhive.forge.httpPort}" + else + "http://127.0.0.1:${toString config.services.hyperhive.forge.httpPort}"; } // lib.optionalAttrs config.services.hyperhive.matrix.gui.enable { # Availability flags read by the dashboard's `/api/state`. diff --git a/nix/modules/hive-network.nix b/nix/modules/hive-network.nix index 66725bc6..2ee1a211 100644 --- a/nix/modules/hive-network.nix +++ b/nix/modules/hive-network.nix @@ -215,6 +215,17 @@ in ip saddr ${cfg.bridgeIp}/${toString cfg.bridgePrefixLength} ip daddr 127.0.0.0/8 drop ''; + # Allow isolated agents to reach the forge via the bridge gateway IP. + # Forgejo binds 0.0.0.0 so it's reachable at `bridgeIp:httpPort` from + # inside agent containers; without this rule the default INPUT policy + # drops the connection before it reaches forgejo. Only added when forge + # is enabled — no-op otherwise. + networking.firewall.interfaces.${cfg.bridgeName}.allowedTCPPorts = + lib.optionals config.services.hyperhive.forge.enable + [ + config.services.hyperhive.forge.httpPort + ]; + # Tells hive-c0re to pass PRIVATE_NETWORK + bridge settings to each # container. HIVE_NETWORK_SUBNET is host-bridge IP/prefix, not canonical # network address — the Rust side normalises before subnet arithmetic.