matrix: serve the web client unconditionally; link it from the swarm domain
Removes services.hyperhive.deploy.matrix.gui.enable and its swarm.matrix.gui.enable alias; both are mkRemovedOptionModule stubs. A host running the homeserver serves fluffychat at gatewayHost's vhost, and the hive's /matrix/ redirect follows the same condition. The swarm-controller builds the Matrix quick link from swarm.matrix.gatewayHost, replacing hive-matrix.nix's per-host entry. HIVE_MATRIX_PUBLIC_URL is set on every hive with a gatewayHost, so `hivectl open matrix` resolves off the homeserver's host too. Drops HIVE_MATRIX_GUI_ENABLED and the dashboard's matrix_gui_enabled field; nothing in the frontend reads it. Refs #4885
This commit is contained in:
parent
8628e0ecdd
commit
f60f8af33b
10 changed files with 48 additions and 96 deletions
|
|
@ -191,12 +191,6 @@ in
|
|||
# one.
|
||||
HIVE_MATRIX_API_URL = config.services.hyperhive.swarm.matrix.apiUrl;
|
||||
}
|
||||
// lib.optionalAttrs config.services.hyperhive.deploy.matrix.gui.enable {
|
||||
# Surfaces as `matrix_gui_enabled` in the dashboard's `/api/state`.
|
||||
# The matrix GUI is served entirely by the gateway nginx. Gateway
|
||||
# routing detail: docs/networking/gateway.md::Vhost map.
|
||||
HIVE_MATRIX_GUI_ENABLED = "1";
|
||||
}
|
||||
// {
|
||||
# The gateway always runs, so the dashboard always builds
|
||||
# same-origin `/agent/<name>/` links (never the direct
|
||||
|
|
@ -216,19 +210,13 @@ in
|
|||
# forge links rather than emitting one it can't justify.
|
||||
HIVE_FORGE_PUBLIC_URL = config.services.hyperhive.swarm.forge.publicUrl;
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs
|
||||
(
|
||||
config.services.hyperhive.deploy.matrix.gui.enable
|
||||
&& config.services.hyperhive.swarm.matrix.gatewayHost != null
|
||||
)
|
||||
{
|
||||
# Browser-facing matrix GUI (fluffychat) URL — the gateway
|
||||
# vhost (`gatewayHost`, `chat.<swarm-domain>` by default). Surfaced via the daemon's `Urls`
|
||||
# request for `hivectl open matrix`. Absent when the GUI is off
|
||||
# or no gatewayHost is set (no browser-reachable matrix vhost).
|
||||
HIVE_MATRIX_PUBLIC_URL = "https://${config.services.hyperhive.swarm.matrix.gatewayHost}/";
|
||||
}
|
||||
// lib.optionalAttrs (config.services.hyperhive.swarm.matrix.gatewayHost != null) {
|
||||
# Browser-facing matrix GUI (fluffychat) URL — the gateway
|
||||
# vhost (`gatewayHost`, `chat.<swarm-domain>` by default). Surfaced via the daemon's `Urls`
|
||||
# request for `hivectl open matrix`. Absent when no gatewayHost is
|
||||
# set (no browser-reachable matrix vhost).
|
||||
HIVE_MATRIX_PUBLIC_URL = "https://${config.services.hyperhive.swarm.matrix.gatewayHost}/";
|
||||
}
|
||||
// lib.optionalAttrs (config.services.hyperhive.swarm.snapshotStore.address != null) {
|
||||
# `host:port` of the swarm's single snapshot store, for pushing agent
|
||||
# snapshots (hive-c0re::snapshot_push). One per swarm, not one per
|
||||
|
|
|
|||
Loading…
Reference in a new issue