From cce41c1d79a05452d6cd908994c0a5655421435d Mon Sep 17 00:00:00 2001 From: atlas Date: Tue, 29 Sep 2026 19:27:40 +0200 Subject: [PATCH] nix: move the in-container modules to nix/container-modules/ Refs #3773 --- .../swarm-container-resolver.nix | 0 nix/{host-modules => container-modules}/swarm-container.nix | 0 nix/host-modules/hive-forge/default.nix | 2 +- nix/host-modules/swarm-authelia.nix | 2 +- nix/host-modules/swarm-bao.nix | 2 +- nix/host-modules/swarm-grafana.nix | 2 +- nix/host-modules/swarm-nats.nix | 2 +- nix/host-modules/swarm-otel.nix | 2 +- nix/host-modules/swarm-victorialogs.nix | 2 +- nix/host-modules/swarm-victoriametrics.nix | 4 ++-- nix/module-eval/swarm-services-switch.nix | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename nix/{host-modules => container-modules}/swarm-container-resolver.nix (100%) rename nix/{host-modules => container-modules}/swarm-container.nix (100%) diff --git a/nix/host-modules/swarm-container-resolver.nix b/nix/container-modules/swarm-container-resolver.nix similarity index 100% rename from nix/host-modules/swarm-container-resolver.nix rename to nix/container-modules/swarm-container-resolver.nix diff --git a/nix/host-modules/swarm-container.nix b/nix/container-modules/swarm-container.nix similarity index 100% rename from nix/host-modules/swarm-container.nix rename to nix/container-modules/swarm-container.nix diff --git a/nix/host-modules/hive-forge/default.nix b/nix/host-modules/hive-forge/default.nix index aef41468..deabc634 100644 --- a/nix/host-modules/hive-forge/default.nix +++ b/nix/host-modules/hive-forge/default.nix @@ -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" diff --git a/nix/host-modules/swarm-authelia.nix b/nix/host-modules/swarm-authelia.nix index 4a256073..c0bee0a1 100644 --- a/nix/host-modules/swarm-authelia.nix +++ b/nix/host-modules/swarm-authelia.nix @@ -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" ]; }) diff --git a/nix/host-modules/swarm-bao.nix b/nix/host-modules/swarm-bao.nix index 78c5a6f9..aaf6e22b 100644 --- a/nix/host-modules/swarm-bao.nix +++ b/nix/host-modules/swarm-bao.nix @@ -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 diff --git a/nix/host-modules/swarm-grafana.nix b/nix/host-modules/swarm-grafana.nix index 026ad54d..4b970e2d 100644 --- a/nix/host-modules/swarm-grafana.nix +++ b/nix/host-modules/swarm-grafana.nix @@ -727,7 +727,7 @@ in { ... }: { imports = [ - (import ./swarm-container-resolver.nix { + (import ../container-modules/swarm-container-resolver.nix { inherit (networkCfg) bridgeIp; dnsConsumers = [ "grafana.service" ]; }) diff --git a/nix/host-modules/swarm-nats.nix b/nix/host-modules/swarm-nats.nix index c8b30c39..95f30363 100644 --- a/nix/host-modules/swarm-nats.nix +++ b/nix/host-modules/swarm-nats.nix @@ -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 diff --git a/nix/host-modules/swarm-otel.nix b/nix/host-modules/swarm-otel.nix index 02e93162..60052dfe 100644 --- a/nix/host-modules/swarm-otel.nix +++ b/nix/host-modules/swarm-otel.nix @@ -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" ]; }) diff --git a/nix/host-modules/swarm-victorialogs.nix b/nix/host-modules/swarm-victorialogs.nix index 677010b6..d450de71 100644 --- a/nix/host-modules/swarm-victorialogs.nix +++ b/nix/host-modules/swarm-victorialogs.nix @@ -279,7 +279,7 @@ in { ... }: { imports = [ - (import ./swarm-container-resolver.nix { + (import ../container-modules/swarm-container-resolver.nix { inherit (networkCfg) bridgeIp; dnsConsumers = [ "victorialogs.service" ]; }) diff --git a/nix/host-modules/swarm-victoriametrics.nix b/nix/host-modules/swarm-victoriametrics.nix index 2f01c7b5..6032a0de 100644 --- a/nix/host-modules/swarm-victoriametrics.nix +++ b/nix/host-modules/swarm-victoriametrics.nix @@ -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" ]; }) diff --git a/nix/module-eval/swarm-services-switch.nix b/nix/module-eval/swarm-services-switch.nix index 41defadb..d40c53cd 100644 --- a/nix/module-eval/swarm-services-switch.nix +++ b/nix/module-eval/swarm-services-switch.nix @@ -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";