3202cde704
`services.hyperhive.enable` and `services.hyperhive.c0re.enable` are gone. One switch, `services.hyperhive.deploy.hive-controller.enable` (default false, as the old toggle was), now gates hive-c0re and hive-priv. Both old paths are `mkRenamedOptionModule` shims in deploy.nix, so a host config that still sets either evaluates as before and gets a rename warning. Every other read of the old toggle is resolved, including the 29 made through the `hyperhiveCfg`/`hiveCfg` aliases: - Dropped: each swarm service and its glue keeps only its own deploy toggle (authelia, bao and its PKI glue, grafana, victorialogs, victoriametrics, the secret publisher, swarm-ca, the OIDC client rows, the controller/nats/matrix-ctl/publisher/services-issuer identities), the forge, and the `domain` deprecation warning. - To deploy.hive-controller.enable: the queue-agent credential reader and its assertion, which feed hive-c0re and write under its state dir, plus their policy-order entry; the network identity assertions; hive-tls's two writes into hive-c0re's environment. - hive-tls runs where the gateway runs self-signed (`gateway.enable && useSelfSigned`), not on every host. - The matrix appservice-token reader and its assertion stay on `deploy.matrix.enable` plus their client-identity checks. They read deploy.matrix's token file and registration script; their deploy.bao inputs are the client-half options a hive sets to read a store it does not run, so gating on deploy.bao.enable would drop the tested remote-reader case. - The `hiveName` assertion moves from hive-network.nix to hyperhive.nix and fires wherever the hive, the store or the homeserver runs: each turns the name into an identifier with no fallback. On a host with `deploy.allSwarmServices` and no hive, the documented services-host recipe, authelia, bao, grafana, victorialogs, victoriametrics, the OIDC client rows and the hive CA now render; before, the old toggle being off left them out. Refs #4500
50 lines
2.3 KiB
Nix
50 lines
2.3 KiB
Nix
# Glue: register the swarm's Grafana as an OIDC client wherever authelia runs.
|
|
#
|
|
# ONE PAIRING PER FILE — grafana ← authelia, and nothing else. Deleting this
|
|
# leaves a swarm whose metrics UI is not a client authelia has ever heard of, so
|
|
# no login against it can complete and nothing minted its secret either.
|
|
#
|
|
# ⚠️ Gated on authelia being HERE, and deliberately NOT on this host running
|
|
# Grafana. A client is a row in THIS host's provider config, so it can only be
|
|
# declared where that config is rendered — and ./swarm-grafana.nix's whole
|
|
# `config` block hangs off `deploy.grafana.enable`, so a swarm with Grafana and
|
|
# authelia on different hosts registered the client nowhere at all.
|
|
# ./glue-forge-oidc-client.nix does the same for the forge. This file puts
|
|
# Grafana there without moving the rest of its module.
|
|
#
|
|
# ⚠️ Registered whether or not the swarm has a Grafana, because nothing in
|
|
# `swarm.*` records that — `deploy.grafana.enable` answers "does THIS host run
|
|
# it", and a swarm-wide answer does not exist. The cost is one unused client
|
|
# and one unused minted secret in a swarm with no metrics UI. The alternative
|
|
# was a new swarm-wide option an operator must set before a split deployment
|
|
# works, which leaves the reported failure in place for everyone who does not
|
|
# know to set it. ./swarm-otel.nix made the same call for its own client when it
|
|
# dropped the published-scrape-target guard: a client that may go unused beats a
|
|
# guard that reads as done and renders nothing.
|
|
{
|
|
lib,
|
|
config,
|
|
...
|
|
}:
|
|
let
|
|
hyperhiveCfg = config.services.hyperhive;
|
|
deployCfg = hyperhiveCfg.deploy;
|
|
grafanaCfg = hyperhiveCfg.swarm.grafana;
|
|
in
|
|
{
|
|
config = lib.mkIf deployCfg.authelia.enable {
|
|
# One declaration, two readers. Grafana's callback URL is format-locked to
|
|
# its own root URL, and the read-only option it is taken from is where that
|
|
# format is spelled — restating it here would be a second source of truth
|
|
# for a string whose mismatch is a silently rejected login.
|
|
#
|
|
# `kind` is left at its `interactive` default: a person logs in here.
|
|
services.hyperhive.swarm.authelia.oidc.clients = [
|
|
{
|
|
id = grafanaCfg.oidc.clientId;
|
|
description = "HyperHive swarm metrics";
|
|
redirectUris = [ grafanaCfg.oidc.redirectUri ];
|
|
}
|
|
];
|
|
};
|
|
}
|