Watch
0
0
Fork
You've already forked hyperhive
0

read the squid options at their new path in the otel fixture; pin the env on a host with a store identity

This commit is contained in:
atlas 2026-10-29 01:56:31 +01:00 • committed by mara
commit fa5293e90a

View file

@ -49,7 +49,7 @@ let
deploy.authelia.enable = true;
# The seed `allowedFile` starts as; the canary is listed too, to show it
# is not written twice.
squid.allowedDomains = [
deploy.hive-controller.squid.allowedDomains = [
"github.com"
"cache.nixos.org"
];
@ -715,7 +715,7 @@ let
hosts = lib.splitString "," e.HIVE_EGRESS_NO_PROXY;
in
e.HIVE_SQUID_PROXY == "${s.network.bridgeIp}:3128"
&& e.HIVE_SQUID_PROXY == s.squid.listen
&& e.HIVE_SQUID_PROXY == s.deploy.hive-controller.squid.listen
&& lib.all (h: lib.elem h hosts) (
[
s.network.bridgeIp
@ -759,7 +759,7 @@ let
let
s = hiveOtelAllLocal.services.hyperhive;
in
lib.elem "http_port ${s.squid.listen}" (
lib.elem "http_port ${s.deploy.hive-controller.squid.listen}" (
lib.splitString "\n" hiveOtelAllLocal.services.squid.configText
);
}