From f9387df76da799231fe6cd056fa18b6cd4482556 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 8 Oct 2024 12:13:51 +0200 Subject: [PATCH] Inventory/enable: dont include disabled services --- lib/inventory/build-inventory/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/inventory/build-inventory/default.nix b/lib/inventory/build-inventory/default.nix index 5e39cee37..acb4756ef 100644 --- a/lib/inventory/build-inventory/default.nix +++ b/lib/inventory/build-inventory/default.nix @@ -63,6 +63,7 @@ let ++ (lib.foldlAttrs ( # [ Modules ], String, ServiceConfig acc2: instanceName: serviceConfig: + let resolvedRoles = builtins.mapAttrs ( roleName: members: @@ -119,8 +120,9 @@ let globalExtraModules ++ machineExtraModules ++ roleServiceExtraModules ); in - - if isInService then + if !serviceConfig.enabled then + acc2 + else if isInService then acc2 ++ [ {