nix: comments state current behaviour, not history
Rewrite comments and option descriptions under nix/ that narrate how the
code got here ("used to", "new name", "sat at the TOP", "no longer",
renamed/moved narration, attributions) to say what the code does now and
why. Comments and description strings only; no logic changes.
Files in open PR #4970's diff are left alone. Refs #3902
This commit is contained in:
parent
ea63b0d150
commit
1c90619fbb
45 changed files with 331 additions and 411 deletions
|
|
@ -215,11 +215,11 @@ let
|
|||
# its identity yet, which is a thing to say out loud rather than to route
|
||||
# around by reaching into authelia's tree whenever it happens to be local.
|
||||
#
|
||||
# 🩸 Grafana's OWN leaf, not `clientCertFile` — the hive's, which four units
|
||||
# used to share. Bao matches a cert-auth role on the CN, so one leaf for four
|
||||
# readers was ONE principal holding the union of four grants: this unit could
|
||||
# read every agent credential in the swarm and every other service's OIDC
|
||||
# client secret, when what it needs is the one path `storeSecretPath` names.
|
||||
# 🩸 Grafana's OWN leaf, not `clientCertFile` — the hive's. Bao matches a
|
||||
# cert-auth role on the CN, so one leaf shared by four readers would be ONE
|
||||
# principal holding the union of four grants: this unit could read every
|
||||
# agent credential in the swarm and every other service's OIDC client
|
||||
# secret, when what it needs is the one path `storeSecretPath` names.
|
||||
haveClientIdentity =
|
||||
baoDeploy.grafanaOidcClientCertFile != null && baoDeploy.grafanaOidcClientKeyFile != null;
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ in
|
|||
and for two different reasons. Traces and Profiles front Tempo
|
||||
and Pyroscope, which this swarm does not run — a UI for a backend
|
||||
that does not answer. Logs Drilldown is the subtler one: this
|
||||
swarm *does* run a log store, so that argument no longer applies
|
||||
swarm *does* run a log store, so that argument does not apply
|
||||
to it, but the app is Loki-only and no configuration here changes
|
||||
that. Its volume views call `/loki/api/v1/index/volume`, which
|
||||
VictoriaLogs does not implement and answers "unsupported path
|
||||
|
|
@ -398,12 +398,12 @@ in
|
|||
services.hyperhive.gateway.enable = lib.mkDefault true;
|
||||
services.hyperhive.gateway.dns.enable = lib.mkDefault true;
|
||||
|
||||
# Registering the client is NOT here any more: it has to happen on the
|
||||
# host that runs authelia, and this whole block is gated on the host that
|
||||
# runs Grafana. ./glue-grafana-oidc-client.nix is where it moved to.
|
||||
# Registering the client is NOT here: it has to happen on the host that
|
||||
# runs authelia, and this whole block is gated on the host that runs
|
||||
# Grafana. ./glue-grafana-oidc-client.nix does it.
|
||||
|
||||
# This arm fires only where Grafana runs — this whole block is under
|
||||
# `deploy.grafana.enable`. SSO itself needs no assertion any more:
|
||||
# `deploy.grafana.enable`. SSO itself needs no assertion:
|
||||
# `swarm.authelia.url` is non-nullable, so every swarm has one and the
|
||||
# OIDC block below always names a real endpoint.
|
||||
assertions = [
|
||||
|
|
@ -511,14 +511,13 @@ in
|
|||
# authelia's host wrote it into, and that is true whether authelia is a
|
||||
# network away or in the container next door.
|
||||
#
|
||||
# 🩸 A second unit here used to copy the plaintext out of authelia's host
|
||||
# tree wherever the two were co-located, with the OIDC block gated on
|
||||
# either route being available. The ruling that deleted it: the store
|
||||
# exists so a host holds ONE out-of-band secret — its client certificate —
|
||||
# and reads everything else with it, so skipping the store when the
|
||||
# producer is local buys a round trip and costs a second delivery path, a
|
||||
# second way for the file to be wrong, and a gate whose false arm was a
|
||||
# Grafana with no login. Recorded in docs/swarm/secrets.md.
|
||||
# 🩸 No second unit copies the plaintext out of authelia's host tree
|
||||
# where the two are co-located. The store exists so a host holds ONE
|
||||
# out-of-band secret — its client certificate — and reads everything else
|
||||
# with it, so skipping the store when the producer is local would buy a
|
||||
# round trip and cost a second delivery path, a second way for the file
|
||||
# to be wrong, and a gate whose false arm is a Grafana with no login.
|
||||
# Recorded in docs/swarm/secrets.md.
|
||||
#
|
||||
# Shaped after ./glue-queue-agent-credential.nix, because it is a store
|
||||
# reader and this is what the store's readers do: a cert login that fails
|
||||
|
|
@ -771,18 +770,17 @@ in
|
|||
# property this option exists for — it should not arrive only
|
||||
# once a plugin happens to be listed.
|
||||
#
|
||||
# - 🩸 and the one this comment used to miss: it also sets
|
||||
# upstream's `plugins.preinstall_disabled` (nixpkgs'
|
||||
# - 🩸 it also sets upstream's `plugins.preinstall_disabled`
|
||||
# (nixpkgs'
|
||||
# grafana.nix defaults it to `declarativePlugins != null`,
|
||||
# saying preinstall "causes issues with declarativePlugins").
|
||||
# Preinstall is what fetches the Drilldown apps on first
|
||||
# start, so claiming this directory silently removes them.
|
||||
# That is why the option's default is not empty.
|
||||
#
|
||||
# The claim that used to sit here — "nothing is taken over on a
|
||||
# hive with no plugins, manual installation is impossible anyway"
|
||||
# — reasoned only about plugins a PERSON installs. Upstream
|
||||
# installs some itself, and those are the ones that went missing.
|
||||
# Taking this directory over is not harmless on a hive with no
|
||||
# plugins: that reasoning covers only plugins a PERSON installs,
|
||||
# and upstream installs some itself.
|
||||
declarativePlugins = deployCfg.grafana.plugins;
|
||||
|
||||
settings = {
|
||||
|
|
@ -839,9 +837,7 @@ in
|
|||
# Not conditional on anything, and the block below is not
|
||||
# either, which is what keeps the two from ever disagreeing.
|
||||
# Whether a password box sits on a public login page cannot
|
||||
# depend on which host happens to run authelia — and it used to,
|
||||
# in a module where the OIDC block was gated and this line was
|
||||
# not.
|
||||
# depend on which host happens to run authelia.
|
||||
auth.disable_login_form = true;
|
||||
|
||||
# Emitted in every deployment, because SSO is a requirement of
|
||||
|
|
|
|||
Loading…
Reference in a new issue