yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Inventory: fixup imports to extraModules

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-09-18 08:27:39 +02:00
parent a10bb59169
commit 61efab995a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/inventory/build-inventory/default.nix
View File

@@ -95,10 +95,10 @@ let
machineServiceConfig = (serviceConfig.machines.${machineName} or { }).config or { }; machineServiceConfig = (serviceConfig.machines.${machineName} or { }).config or { };
globalConfig = serviceConfig.config or { }; globalConfig = serviceConfig.config or { };
globalImports = serviceConfig.imports or [ ]; globalExtraModules = serviceConfig.extraModules or [ ];
machineImports = serviceConfig.machines.${machineName}.imports or [ ]; machineExtraModules = serviceConfig.machines.${machineName}.extraModules or [ ];
roleServiceImports = builtins.foldl' ( roleServiceExtraModules = builtins.foldl' (
acc: role: acc ++ serviceConfig.roles.${role}.imports or [ ] acc: role: acc ++ serviceConfig.roles.${role}.extraModules or [ ]
) [ ] inverseRoles.${machineName} or [ ]; ) [ ] inverseRoles.${machineName} or [ ];
# TODO: maybe optimize this dont lookup the role in inverse roles. Imports are not lazy # TODO: maybe optimize this dont lookup the role in inverse roles. Imports are not lazy
@@ -119,8 +119,8 @@ let
builtins.map (role: serviceConfig.roles.${role}.config or { }) inverseRoles.${machineName} or [ ] builtins.map (role: serviceConfig.roles.${role}.config or { }) inverseRoles.${machineName} or [ ]
); );
customImports = map (s: if builtins.typeOf s == "string" then "${directory}/${s}" else s) ( extraModules = map (s: if builtins.typeOf s == "string" then "${directory}/${s}" else s) (
globalImports ++ machineImports ++ roleServiceImports globalExtraModules ++ machineExtraModules ++ roleServiceExtraModules
); );
in in
@@ -128,7 +128,7 @@ let
acc2 acc2
++ [ ++ [
{ {
imports = [ clan-core.clanModules.${serviceName} ] ++ roleModules ++ customImports; imports = [ clan-core.clanModules.${serviceName} ] ++ roleModules ++ extraModules;
} }
(lib.optionalAttrs (globalConfig != { } || machineServiceConfig != { } || roleServiceConfigs != [ ]) (lib.optionalAttrs (globalConfig != { } || machineServiceConfig != { } || roleServiceConfigs != [ ])
{ {