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
|
|
@ -1,9 +1,9 @@
|
|||
# The hive-c0re coordinator daemon (runs as the unprivileged
|
||||
# `hive-core` user), socket-activated at /run/hyperhive/host.sock.
|
||||
# Layout: ./options.nix (option declarations), ./theme.nix (stylix
|
||||
# frontend theming → `servedFrontend`), ./environment.nix (the daemon
|
||||
# unit's env attrset). The root privileged helper it delegates to is
|
||||
# its own module (../hive-priv.nix).
|
||||
# frontend theming → `servedFrontend`), ./vhosts.nix (its gateway vhosts),
|
||||
# ./environment.nix (the daemon unit's env attrset). The root privileged
|
||||
# helper it delegates to is its own module (../hive-priv.nix).
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
|
|
@ -125,6 +125,7 @@ in
|
|||
imports = [
|
||||
./options.nix
|
||||
./theme.nix
|
||||
./vhosts.nix
|
||||
# Hive-CA trust for this daemon's outbound TLS. The matrix provisioning
|
||||
# URL (`swarm.matrix.apiUrl`) defaults to https on the homeserver's
|
||||
# gateway vhost, which serves a leaf chaining to the store's pki root —
|
||||
|
|
|
|||
Loading…
Reference in a new issue