keep the mirror hint off forge errors, forward the hyperhive mirror from any controller host
This commit is contained in:
parent
a6b5bafa83
commit
52cdfe84a0
1 changed files with 70 additions and 36 deletions
|
|
@ -171,6 +171,9 @@ in
|
|||
|
||||
imports = [
|
||||
./service.nix
|
||||
# Set on every host, not only the forge's: the controller's host forwards the
|
||||
# list whether or not the forge runs beside it.
|
||||
{ services.hyperhive.deploy.forgejo.effectiveMirrors = effectiveMirrors; }
|
||||
(lib.mkRemovedOptionModule [ "services" "hyperhive" "deploy" "forgejo" "sso" "clientSecretFile" ] ''
|
||||
The forge's OIDC client secret is fetched from the swarm secret store
|
||||
(swarm-bao-forge-oidc) into a fixed runtime path. Remove this
|
||||
|
|
@ -311,12 +314,13 @@ in
|
|||
build fetches it from there, so without it the first agent's
|
||||
`update_meta` step fails and no agent container is built.
|
||||
|
||||
Defaults to `https://forge.darkest.space/hyperhive/hyperhive` when this
|
||||
host also runs the swarm-controller, which seeds the mirror (set by
|
||||
`glue-forge-controller.nix`), and to `null` otherwise. The controller
|
||||
creates the mirror only when `hyperhive/hyperhive` does not exist: a
|
||||
swarm that already holds the repo as a normal repo keeps it unchanged. A `hyperhive/hyperhive` entry in
|
||||
{option}`services.hyperhive.deploy.forgejo.mirrors` takes precedence.
|
||||
Defaults to `https://forge.darkest.space/hyperhive/hyperhive` on a host
|
||||
that runs the swarm-controller, which seeds the mirror on the swarm's
|
||||
forge wherever that runs (set by `glue-forge-controller.nix`), and to
|
||||
`null` otherwise. The controller creates the mirror only when
|
||||
`hyperhive/hyperhive` does not exist: a swarm that already holds the
|
||||
repo as a normal repo keeps it unchanged. A `hyperhive/hyperhive` entry
|
||||
in {option}`services.hyperhive.deploy.forgejo.mirrors` takes precedence.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -1400,7 +1404,6 @@ in
|
|||
# ../glue-forge-controller.nix); a controller elsewhere reads its own
|
||||
# host's list, so the warning below says so at eval rather than leaving
|
||||
# it to be noticed as a missing repo.
|
||||
services.hyperhive.deploy.forgejo.effectiveMirrors = effectiveMirrors;
|
||||
warnings = lib.optional (effectiveMirrors != [ ] && !deployCfg.swarm-controller.enable) ''
|
||||
services.hyperhive.deploy.forgejo.mirrors (or the actions/* and hyperhive mirrors
|
||||
deploy.forgejo.actionsFromSelf and hyperhiveUpstream add) is set on a host that does not run the
|
||||
|
|
|
|||
Loading…
Reference in a new issue