move the small per-service host options to deploy.<service>
This commit is contained in:
parent
400fdd7f0e
commit
525de62b06
1 changed files with 407 additions and 251 deletions
|
|
@ -171,7 +171,7 @@ let
|
|||
in
|
||||
d.hive-controller.statusPublish.natsUrl == natsUrl
|
||||
&& d.hive-controller.queue.agentNatsUrl == natsUrl
|
||||
&& allLocal.services.hyperhive.swarm.controller.queue.natsUrl == natsUrl;
|
||||
&& allLocal.services.hyperhive.deploy.swarm-controller.queue.natsUrl == natsUrl;
|
||||
}
|
||||
{
|
||||
name = "the queue's name is served by this host's resolver, at the bridge address";
|
||||
|
|
@ -317,7 +317,7 @@ let
|
|||
&& lib.all (u: u == natsUrl) (lib.attrValues s)
|
||||
&& d.hive-controller.statusPublish.natsUrl == natsUrl
|
||||
&& d.hive-controller.queue.agentNatsUrl == natsUrl
|
||||
&& remote.services.hyperhive.swarm.controller.queue.natsUrl == natsUrl;
|
||||
&& remote.services.hyperhive.deploy.swarm-controller.queue.natsUrl == natsUrl;
|
||||
}
|
||||
{
|
||||
# The URL is set and the hive holds no store leaf, which is every such
|
||||
|
|
@ -387,14 +387,14 @@ let
|
|||
]
|
||||
&& locs."/".return == "403"
|
||||
&& locs."/".proxyPass == null
|
||||
&& locs."= /metrics".proxyPass == "http://127.0.0.1:${toString h.swarm.nats.metricsPort}/metrics"
|
||||
&& locs."= /metrics".proxyPass == "http://127.0.0.1:${toString h.deploy.nats.metricsPort}/metrics"
|
||||
&& checksOf locs."= /metrics" == [ "auth_request /__nats_metrics_authz;" ]
|
||||
&& !(lib.hasInfix "error_page" locs."= /metrics".extraConfig)
|
||||
&& authz.proxyPass == "https://auth.t.local/api/authz/auth-request"
|
||||
&& lib.hasInfix "internal;" authz.extraConfig
|
||||
&& !(lib.any (
|
||||
l:
|
||||
lib.hasInfix ":${toString h.swarm.nats.monitorPort}" (
|
||||
lib.hasInfix ":${toString h.deploy.nats.monitorPort}" (
|
||||
if l.proxyPass == null then "" else l.proxyPass
|
||||
)
|
||||
) (lib.attrValues locs))
|
||||
|
|
|
|||
Loading…
Reference in a new issue