swarm: move grafana's package to deploy, beside the rest of its host knobs
Same rule as the matrix pair: which build a service runs is a decision of the host that runs it, so `package` follows `enable` out of the namespace every hive must agree on byte for byte. Grafana already had a `deploy.grafana` block holding the datasources, the plugin list and the socket directory, so this is the package joining options it belongs with rather than a new namespace. Prose: the swarm-side header listed "its package" among what stays; the deploy-side header listed what the host decides without it. Both edited, which is the fix — a substitution on the first alone would have left the second silently incomplete. `swarm-grafana.nix:219` was on the sweep list and is NOT edited: it says what stays above is what the service is to every hive, and that stays true once the package leaves. The stale half was the sentence after it. Refs #3772.
This commit is contained in:
parent
d6f23ff371
commit
0002c15dc3
3 changed files with 23 additions and 18 deletions
|
|
@ -349,6 +349,10 @@ in
|
|||
[ "services" "hyperhive" "swarm" "matrix" "gui" "package" ]
|
||||
[ "services" "hyperhive" "deploy" "matrix" "gui" "package" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "hyperhive" "swarm" "grafana" "package" ]
|
||||
[ "services" "hyperhive" "deploy" "grafana" "package" ]
|
||||
)
|
||||
];
|
||||
|
||||
# ⚠️ `deploy.forgejo` is declared in ./hive-ci.nix, not here, and it is the
|
||||
|
|
|
|||
Loading…
Reference in a new issue