vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nix: inline the tls alias instead of a local let-binding

Browse source
This commit is contained in:
damocles 2026-09-13 18:51:43 +02:00 • committed by mara
commit 6271d5db13
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix/host-modules/swarm-authelia.nix
View file

@ -99,8 +99,10 @@ let
unitName = "authelia-${instance}"; unitName = "authelia-${instance}";
stateDir = "/var/lib/${unitName}"; stateDir = "/var/lib/${unitName}";
tlsCfg = deployCfg.hive-controller.tls; caTrust = import ./lib/hive-ca-trust.nix {
caTrust = import ./lib/hive-ca-trust.nix { inherit lib tlsCfg gatewayCfg; }; inherit lib gatewayCfg;
tlsCfg = deployCfg.hive-controller.tls;
};
# `swarm-authelia-bridge` verifies the gateway when it introspects by name. # `swarm-authelia-bridge` verifies the gateway when it introspects by name.
# Nothing in this container trusted the swarm CA, which is a runtime file no # Nothing in this container trusted the swarm CA, which is a runtime file no
# build-time option can name — so an https call out of here could only ever # build-time option can name — so an https call out of here could only ever

6
nix/host-modules/swarm-grafana.nix
View file

@ -20,13 +20,15 @@ let
networkCfg = config.services.hyperhive.network; networkCfg = config.services.hyperhive.network;
hyperhiveCfg = config.services.hyperhive; hyperhiveCfg = config.services.hyperhive;
gatewayCfg = hyperhiveCfg.gateway; gatewayCfg = hyperhiveCfg.gateway;
tlsCfg = deployCfg.hive-controller.tls;
autheliaCfg = hyperhiveCfg.swarm.authelia; autheliaCfg = hyperhiveCfg.swarm.authelia;
vmCfg = hyperhiveCfg.swarm.victoriametrics; vmCfg = hyperhiveCfg.swarm.victoriametrics;
vlCfg = hyperhiveCfg.swarm.victorialogs; vlCfg = hyperhiveCfg.swarm.victorialogs;
swarmDomain = hyperhiveCfg.swarm.domain; swarmDomain = hyperhiveCfg.swarm.domain;
caTrust = import ./lib/hive-ca-trust.nix { inherit lib tlsCfg gatewayCfg; }; caTrust = import ./lib/hive-ca-trust.nix {
inherit lib gatewayCfg;
tlsCfg = deployCfg.hive-controller.tls;
};
# Spelled ONCE. The provisioned datasource declares it and every panel in the # Spelled ONCE. The provisioned datasource declares it and every panel in the
# provisioned dashboards references it; a second literal would be free to # provisioned dashboards references it; a second literal would be free to