vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Activity

move hiveName to deploy.hive-controller; only a hive host needs a name

Browse source
This commit is contained in:
atlas 2026-10-26 16:06:11 +01:00 • committed by mara
commit 0c6e8fc5a2
37 changed files with 402 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nix/host-modules/hive-tls.nix
View file

@ -68,17 +68,20 @@ let
# goes on the swarm-services leaf below, and asking this role for one is a
# refusal.
hiveLeafRole =
if hyperhiveCfg.hiveName == null then
if hyperhiveCfg.deploy.hive-controller.hiveName == null then
null
else
"${baoDeploy.hiveLeafPkiRolePrefix}-${hyperhiveCfg.hiveName}";
"${baoDeploy.hiveLeafPkiRolePrefix}-${hyperhiveCfg.deploy.hive-controller.hiveName}";
# Everything after the first rides as a SAN.
hiveLeafNames = [
domain
"*.${domain}"
]
++ lib.optional (hyperhiveCfg.swarm.dashboardDomain != null) hyperhiveCfg.swarm.dashboardDomain;
hiveLeafNames =
lib.optionals (domain != null) [
domain
"*.${domain}"
]
++ lib.optional (
hyperhiveCfg.deploy.hive-controller.dashboardDomain != null
) hyperhiveCfg.deploy.hive-controller.dashboardDomain;
showPath = p: if p == null then "unset" else p;
@ -522,7 +525,7 @@ in
# even while its current leaf is still valid.
${
if hiveLeafRole == null then
''fail "services.hyperhive.hiveName is unset, so this hive has no gateway-leaf role to issue from."''
''fail "services.hyperhive.deploy.hive-controller.hiveName is unset, so this hive has no gateway-leaf role to issue from."''
else
requireHiveIdentity "ask the store for its gateway leaf"
}