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

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

Browse source
This commit is contained in:
atlas 2026-10-29 01:56:31 +01:00 • committed by mara
commit fa5293e90a
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix/module-eval/core-toggle.nix
View file

@ -1667,7 +1667,6 @@ let
"selfcheck.canary" "selfcheck.canary"
] ]
&& !(warned bare "allowedDomains") && !(warned bare "allowedDomains")
&& old.systemd.services.hive-c0re.environment.HIVE_SQUID_USERS_FILE == "/var/lib/legacy-squid/users"
&& old.services.squid.configText == new.services.squid.configText && old.services.squid.configText == new.services.squid.configText
&& lib.hasInfix "legacy-c.example" old.services.squid.configText && lib.hasInfix "legacy-c.example" old.services.squid.configText
&& !(lib.hasInfix "legacy-c.example" bare.services.squid.configText); && !(lib.hasInfix "legacy-c.example" bare.services.squid.configText);
@ -1675,14 +1674,18 @@ let
{ {
# The default render, pinned so moving the options changes none of it: # The default render, pinned so moving the options changes none of it:
# the listen address squid binds and hive-c0re hands out, and the users # the listen address squid binds and hive-c0re hands out, and the users
# file hive-c0re writes. # file hive-c0re writes, on a hive holding a store identity.
name = "squid's default listen address and users file reach squid.conf and hive-c0re unchanged"; name = "squid's default listen address and users file reach squid.conf and hive-c0re unchanged";
ok = ok =
let let
e = bare.systemd.services.hive-c0re.environment; withIdentity = hiveWithController {
conf = bare.services.squid.configText; deploy.bao.enable = true;
deploy.authelia.enable = true;
};
e = withIdentity.systemd.services.hive-c0re.environment;
conf = withIdentity.services.squid.configText;
in in
e.HIVE_SQUID_PROXY == "${bare.services.hyperhive.network.bridgeIp}:3128" e.HIVE_SQUID_PROXY == "${withIdentity.services.hyperhive.network.bridgeIp}:3128"
&& e.HIVE_SQUID_USERS_FILE == "/var/lib/hive-squid/users" && e.HIVE_SQUID_USERS_FILE == "/var/lib/hive-squid/users"
&& lib.hasInfix "http_port ${e.HIVE_SQUID_PROXY}" conf && lib.hasInfix "http_port ${e.HIVE_SQUID_PROXY}" conf
&& lib.hasInfix "basic_ncsa_auth /var/lib/hive-squid/users" conf && lib.hasInfix "basic_ncsa_auth /var/lib/hive-squid/users" conf

6
nix/module-eval/hive-otel.nix
View file

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