Watch
0
0
Fork
You've already forked hyperhive
0

nix: move the in-container modules to nix/container-modules/

Refs #3773
This commit is contained in:
atlas 2026-09-29 19:27:40 +02:00 • committed by mara
commit cce41c1d79
11 changed files with 10 additions and 10 deletions

View file

@ -711,7 +711,7 @@ in
# Both units that make an outbound call are consumers, for the
# same reason the trust bundle below names both: an unordered
# resolver write is a race that only shows up on a cold boot.
(import ./../swarm-container-resolver.nix {
(import ./../../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
dnsConsumers = [
"forgejo.service"

View file

@ -1224,7 +1224,7 @@ in
{ ... }:
{
imports = [
(import ./swarm-container-resolver.nix {
(import ../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
dnsConsumers = [ "authelia-${instance}.service" ];
})

View file

@ -3513,7 +3513,7 @@ in
{ config, ... }:
{
imports = [
(import ./swarm-container-resolver.nix {
(import ../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
# The forwarder resolves two swarm names of its own — the
# collector it exports to and the identity provider it mints

View file

@ -727,7 +727,7 @@ in
{ ... }:
{
imports = [
(import ./swarm-container-resolver.nix {
(import ../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
dnsConsumers = [ "grafana.service" ];
})

View file

@ -747,7 +747,7 @@ in
{ ... }:
{
imports = [
(import ./swarm-container-resolver.nix {
(import ../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
# The responder introspects authelia BY NAME on every auth
# request, and a responder that cannot resolve it denies

View file

@ -1194,7 +1194,7 @@ in
# taken once at boot, so without this the upstream export
# depends on the host's file having been right at that instant.
imports = [
(import ./swarm-container-resolver.nix {
(import ../container-modules/swarm-container-resolver.nix {
inherit (config.services.hyperhive.network) bridgeIp;
dnsConsumers = [ "opentelemetry-collector.service" ];
})

View file

@ -279,7 +279,7 @@ in
{ ... }:
{
imports = [
(import ./swarm-container-resolver.nix {
(import ../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
dnsConsumers = [ "victorialogs.service" ];
})

View file

@ -200,8 +200,8 @@ in
{ ... }:
{
imports = [
./swarm-container.nix
(import ./swarm-container-resolver.nix {
../container-modules/swarm-container.nix
(import ../container-modules/swarm-container-resolver.nix {
inherit (networkCfg) bridgeIp;
dnsConsumers = [ "victoriametrics.service" ];
})

View file

@ -186,7 +186,7 @@ let
&& !(s ? swarm-bao-queue-agent);
}
{
# Both values come from ../host-modules/swarm-container.nix. Read
# Both values come from ../container-modules/swarm-container.nix. Read
# through the metrics store: nothing else in this suite evaluates that
# container's config.
name = "a service container on the host netns runs no firewall or resolvconf of its own";