parent
0fc77df1a9
commit
8e09f8360a
47 changed files with 98 additions and 1026 deletions
|
|
@ -995,36 +995,6 @@ let
|
|||
&& bare.services.dnsmasq.enable
|
||||
&& bare.networking.bridges ? hive-br0;
|
||||
}
|
||||
{
|
||||
# A host config written against either old spelling still runs its hive.
|
||||
# The builder's own `true` is lowered to `mkDefault false`, so only the
|
||||
# forwarded definition can turn it on.
|
||||
name = "the old hive toggles forward to deploy.hive-controller.enable and warn";
|
||||
ok =
|
||||
let
|
||||
renamedFrom =
|
||||
old: m:
|
||||
lib.any (
|
||||
w: lib.hasInfix old w && lib.hasInfix "services.hyperhive.deploy.hive-controller.enable" w
|
||||
) m.warnings;
|
||||
viaOld =
|
||||
extra:
|
||||
hive (
|
||||
extra
|
||||
// {
|
||||
deploy.hive-controller.enable = lib.mkDefault false;
|
||||
}
|
||||
);
|
||||
oldEnable = viaOld { enable = true; };
|
||||
oldC0re = viaOld { c0re.enable = true; };
|
||||
in
|
||||
oldEnable.services.hyperhive.deploy.hive-controller.enable
|
||||
&& oldEnable.systemd.services ? hive-c0re
|
||||
&& renamedFrom "services.hyperhive.enable" oldEnable
|
||||
&& oldC0re.services.hyperhive.deploy.hive-controller.enable
|
||||
&& oldC0re.systemd.services ? hive-c0re
|
||||
&& renamedFrom "services.hyperhive.c0re.enable" oldC0re;
|
||||
}
|
||||
{
|
||||
# Refused wherever something turns the name into an identifier, and only
|
||||
# there. The store host is the control that the refusal is not the hive's
|
||||
|
|
|
|||
Loading…
Reference in a new issue