nix: finish the current-behaviour comment sweep in touched files
Rewrite the remaining narration in files the previous commit touched: "moved"/"sat"/"was REMOVED"/"old default" comments in swarm-bao, swarm-otel, glue-bao-tls, nats-authelia, swarm-controller, swarm-ui, swarm-otel-service, swarm-authelia-service, the deploy.nix rename table, hive-ci, hive-forge/service, hive-tls, hyperhive, swarm-nats, swarm.nix and a few module-eval fixtures, so each says where a thing is or why it is so now. Revert the comment edits inside shell script strings in hive-tls, swarm-nats and the forge token mint to their previous text, so those generated units are unchanged. The only unit still changing is swarm-bao-pki (two comment lines in its script). Refs #3902
This commit is contained in:
parent
1c90619fbb
commit
e990e9a0be
21 changed files with 102 additions and 103 deletions
|
|
@ -11,8 +11,8 @@ let
|
|||
hiveCfg = config.services.hyperhive;
|
||||
in
|
||||
{
|
||||
# The swarm's display name moved under `swarm` when the swarm-global
|
||||
# settings were consolidated; the hive's own name and domain stayed put,
|
||||
# The swarm's display name lives under `swarm`, with the other
|
||||
# swarm-global settings; the hive's own name and domain are top-level,
|
||||
# because they describe this hive rather than the swarm it joins.
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
|
|
@ -39,11 +39,10 @@ in
|
|||
# "the other hives can't reach me", on a machine other than the
|
||||
# misconfigured one.
|
||||
#
|
||||
# ⚠️ The `<hiveName>.<swarm.domain>` formula did NOT move here from
|
||||
# there and back: it lives once, on `hives.<name>.domain`, which
|
||||
# this reads. Restoring a direct fallback here would recreate the
|
||||
# second path (and, since that default reads `swarm.domain` too, a
|
||||
# value that can differ from the directory's).
|
||||
# ⚠️ The `<hiveName>.<swarm.domain>` formula lives once, on
|
||||
# `hives.<name>.domain`, which this reads. A direct fallback here
|
||||
# would recreate the second path (and, since that default reads
|
||||
# `swarm.domain` too, a value that can differ from the directory's).
|
||||
default =
|
||||
if hiveCfg.hiveName != null && hiveCfg.swarm.hives ? ${hiveCfg.hiveName} then
|
||||
hiveCfg.swarm.hives.${hiveCfg.hiveName}.domain
|
||||
|
|
|
|||
Loading…
Reference in a new issue