Inventory: allow arbitrary imports from nix
This commit is contained in:
committed by
hsjobeki
parent
c63f5b7b92
commit
c21a265e21
@@ -145,7 +145,7 @@ let
|
||||
builtins.map (role: serviceConfig.roles.${role}.config or { }) inverseRoles.${machineName} or [ ]
|
||||
);
|
||||
|
||||
customImports = map (s: "${directory}/${s}") (
|
||||
customImports = map (s: if builtins.typeOf s == "string" then "${directory}/${s}" else s) (
|
||||
globalImports ++ machineImports ++ roleServiceImports
|
||||
);
|
||||
in
|
||||
|
||||
@@ -61,7 +61,12 @@ let
|
||||
|
||||
'';
|
||||
default = [ ];
|
||||
type = types.listOf types.str;
|
||||
type = types.listOf (
|
||||
types.oneOf [
|
||||
types.str
|
||||
types.anything
|
||||
]
|
||||
);
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user