move the hive's vhosts and matrix discovery out of the gateway
The dashboard vhost, the hive domain vhost and the dashboard's local name move to hive-c0re/vhosts.nix; the matrix .well-known discovery and the legacy /matrix/ redirect move to glue-matrix-hive-discovery.nix, which adds them to the hive domain vhost. Both declare through gateway.vhosts. hive-gateway/vhosts.nix keeps the catch-all only, and the gateway no longer reads deploy.matrix or c0re.servedFrontend, nor deploy.hive-controller.enable for its vhosts. Part of #3742.
This commit is contained in:
parent
2489830772
commit
b4c5954491
17 changed files with 391 additions and 378 deletions
|
|
@ -484,12 +484,13 @@ let
|
|||
&& allLocal.systemd.services.hive-c0re.environment.HYPERHIVE_DASHBOARD_DOMAIN == "h1.hives.t.local";
|
||||
}
|
||||
{
|
||||
# The gateway's own three vhosts are declared under `gateway.vhosts` like
|
||||
# a service's, so the gateway's listen set and issuer choice reach them
|
||||
# The gateway's catch-all and the hive's two vhosts (../host-modules/
|
||||
# hive-c0re/vhosts.nix) are declared under `gateway.vhosts` like a
|
||||
# service's, so the gateway's listen set and issuer choice reach them
|
||||
# by the same path. The catch-all keeps its bare `return 444;` (no
|
||||
# headers: it sends no response) and the dashboard keeps its exact
|
||||
# location set.
|
||||
name = "the gateway's own vhosts render with its listen set, issuer choice, headers and locations";
|
||||
name = "the catch-all and the hive's vhosts render with the gateway's listen set, issuer choice, headers and locations";
|
||||
ok =
|
||||
let
|
||||
gw = allLocal.services.hyperhive.gateway;
|
||||
|
|
|
|||
Loading…
Reference in a new issue