diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix index ef18cfb..6a1a895 100644 --- a/nix/lib/config/legacy.nix +++ b/nix/lib/config/legacy.nix @@ -137,7 +137,6 @@ in dnscache = { role = "container"; - location = "server2"; interfaces.serv = { gw4 = "serv-gw"; @@ -310,7 +309,6 @@ in ctPillar = self.lib.saltPillarFor name; in { role = "container"; - location = "server2"; interfaces = builtins.mapAttrs (net: interface: diff --git a/nix/nixos-module/server/lxc-containers.nix b/nix/nixos-module/server/lxc-containers.nix index 7c11897..d20252b 100644 --- a/nix/nixos-module/server/lxc-containers.nix +++ b/nix/nixos-module/server/lxc-containers.nix @@ -13,10 +13,9 @@ let # Containers that are run on this host containers = - lib.filterAttrs (_: { role, model, location, ... }: + lib.filterAttrs (_: { role, model, ... }: role == "container" && - model == "lxc" && - location == hostName + model == "lxc" ) config.site.hosts; enabled = containers != {}; diff --git a/nix/nixos-module/server/network.nix b/nix/nixos-module/server/network.nix index fc64eb2..2477901 100644 --- a/nix/nixos-module/server/network.nix +++ b/nix/nixos-module/server/network.nix @@ -4,10 +4,9 @@ let # LXC containers on this host containers = - lib.filterAttrs (_: { role, model, location, ... }: + lib.filterAttrs (_: { role, model, ... }: role == "container" && - model == "lxc" && - location == hostName + model == "lxc" ) config.site.hosts; # Every bridged veth network required by all containers