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
|
|
@ -375,13 +375,14 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
# `enable` moved to `services.hyperhive.deploy.swarm-controller.enable` — see
|
||||
# ./deploy.nix. `services.hyperhive.deploy.singleHostSwarm` still
|
||||
# asserts it, and that was never an exception to "not derived from
|
||||
# `enable` is `services.hyperhive.deploy.swarm-controller.enable` — see
|
||||
# ./deploy.nix. `services.hyperhive.deploy.singleHostSwarm` asserts
|
||||
# it, and that is not an exception to "not derived from
|
||||
# deploy.hive-controller.enable": that mode says "this box is the whole
|
||||
# deployment", which answers the topology question outright, where
|
||||
# `enable` alone never can. Both packages moved to that same
|
||||
# `deploy.swarm-controller` block. What stays here is what the daemon IS.
|
||||
# `enable` alone never can. Both packages are in that same
|
||||
# `deploy.swarm-controller` block. What is declared here is what the
|
||||
# daemon IS.
|
||||
|
||||
staleAfterSeconds = lib.mkOption {
|
||||
type = lib.types.ints.positive;
|
||||
|
|
@ -612,8 +613,8 @@ in
|
|||
matrixHomeserverUrl = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
# `gatewayHost`'s own vhost, not a re-derivation of its default: a
|
||||
# deployment that pins `gatewayHost` (e.g. to keep a name from before
|
||||
# it moved under the swarm domain) still has one homeserver, and this
|
||||
# deployment that pins `gatewayHost` (e.g. to the per-hive name) still
|
||||
# has one homeserver, and this
|
||||
# option has to name the same one.
|
||||
default = if matrixCfg.gatewayHost == null then null else "https://${matrixCfg.gatewayHost}";
|
||||
defaultText = lib.literalExpression ''"https://''${services.hyperhive.swarm.matrix.gatewayHost}"'';
|
||||
|
|
|
|||
Loading…
Reference in a new issue