diff --git a/clanServices/wifi/default.nix b/clanServices/wifi/default.nix index e6226b476..897a1802b 100644 --- a/clanServices/wifi/default.nix +++ b/clanServices/wifi/default.nix @@ -39,7 +39,7 @@ in }; perInstance = - { settings, ... }: + { instanceName, settings, ... }: { nixosModule = { pkgs, config, ... }: @@ -86,7 +86,7 @@ in # service to generate the environment file containing all secrets, as # expected by the nixos NetworkManager-ensure-profile service - systemd.services.NetworkManager-setup-secrets = { + systemd.services."NetworkManager-setup-secrets-${instanceName}" = { description = "Generate wifi secrets for NetworkManager"; requiredBy = [ "NetworkManager-ensure-profiles.service" ]; partOf = [ "NetworkManager-ensure-profiles.service" ]; diff --git a/clanServices/wifi/tests/vm/default.nix b/clanServices/wifi/tests/vm/default.nix index a632da8e3..6f82932ab 100644 --- a/clanServices/wifi/tests/vm/default.nix +++ b/clanServices/wifi/tests/vm/default.nix @@ -7,8 +7,16 @@ inventory = { machines.test = { }; + machines.second = { }; instances = { + wg-test-all = { + module.name = "@clan/wifi"; + module.input = "self"; + roles.default.tags.all = { }; + roles.default.settings.networks.all = { }; + }; + wg-test-one = { module.name = "@clan/wifi"; module.input = "self";