move the squid host options to deploy.hive-controller.squid
This commit is contained in:
parent
c9b5705ad8
commit
da16487800
1 changed files with 168 additions and 57 deletions
|
|
@ -18,7 +18,7 @@
|
|||
}:
|
||||
let
|
||||
hyperhiveCfg = config.services.hyperhive;
|
||||
cfg = hyperhiveCfg.squid;
|
||||
cfg = hyperhiveCfg.deploy.hive-controller.squid;
|
||||
netCfg = hyperhiveCfg.network;
|
||||
|
||||
port = 3128;
|
||||
|
|
@ -232,7 +232,7 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
options.services.hyperhive.squid = {
|
||||
options.services.hyperhive.deploy.hive-controller.squid = {
|
||||
listen = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = listen;
|
||||
|
|
@ -492,7 +492,7 @@ in
|
|||
{
|
||||
assertion = !(builtins.elem cfg.selfcheck.unrestrictedCanary (allowed ++ base));
|
||||
message = ''
|
||||
services.hyperhive.squid.selfcheck.unrestrictedCanary must be a name outside
|
||||
services.hyperhive.deploy.hive-controller.squid.selfcheck.unrestrictedCanary must be a name outside
|
||||
allowedDomains and baseAllowedDomains, or the self-check cannot tell an unrestricted user from a
|
||||
restricted one.
|
||||
'';
|
||||
|
|
|
|||
Loading…
Reference in a new issue