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

Compare commits

base: vinzenz:6271d5db1340238c9876bc9517249b657f1323d1
Branches Tags
vinzenz:main
..
compare: vinzenz:9f8df505c68aad727dd28e61413178bec3319066
Branches Tags
vinzenz:main
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,10 +99,8 @@ let
unitName = "authelia-${instance}"; unitName = "authelia-${instance}";
stateDir = "/var/lib/${unitName}"; stateDir = "/var/lib/${unitName}";
caTrust = import ./lib/hive-ca-trust.nix { tlsCfg = hyperhiveCfg.tls;
inherit lib gatewayCfg; caTrust = import ./lib/hive-ca-trust.nix { inherit lib tlsCfg 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,15 +20,13 @@ 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 = hyperhiveCfg.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 { caTrust = import ./lib/hive-ca-trust.nix { inherit lib tlsCfg gatewayCfg; };
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

2
nix/host-modules/swarm-otel.nix
View file

@ -163,7 +163,7 @@ let
# `security.pki.certificateFiles`. # `security.pki.certificateFiles`.
caTrust = import ./lib/hive-ca-trust.nix { caTrust = import ./lib/hive-ca-trust.nix {
inherit lib; inherit lib;
tlsCfg = deployCfg.hive-controller.tls; tlsCfg = hyperhiveCfg.tls;
inherit gatewayCfg; inherit gatewayCfg;
}; };