Commit all parameters from the process manager configuration
This commit is contained in:
parent
f277b95d29
commit
4af0f746a8
|
@ -11,6 +11,8 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit (profileSettings) params;
|
||||||
|
|
||||||
nixosModules = [];
|
nixosModules = [];
|
||||||
|
|
||||||
systemPackages = [
|
systemPackages = [
|
||||||
|
|
|
@ -26,6 +26,8 @@ let
|
||||||
} // profileSettingsSystem.params);
|
} // profileSettingsSystem.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit (profileSettingsSystem) params;
|
||||||
|
|
||||||
nixosModules = [];
|
nixosModules = [];
|
||||||
|
|
||||||
systemPackages = [
|
systemPackages = [
|
||||||
|
|
|
@ -15,6 +15,8 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit (profileSettings) params;
|
||||||
|
|
||||||
nixosModules = [];
|
nixosModules = [];
|
||||||
|
|
||||||
systemPackages = [
|
systemPackages = [
|
||||||
|
|
|
@ -15,6 +15,8 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit (profileSettings) params;
|
||||||
|
|
||||||
nixosModules = [];
|
nixosModules = [];
|
||||||
|
|
||||||
systemPackages = [
|
systemPackages = [
|
||||||
|
|
|
@ -14,6 +14,8 @@ let
|
||||||
else "SYSTEMD_TARGET_DIR=/etc/systemd-mutable/system";
|
else "SYSTEMD_TARGET_DIR=/etc/systemd-mutable/system";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit (profileSettings) params;
|
||||||
|
|
||||||
nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix;
|
nixosModules = pkgs.lib.optional profileSettings.params.forceDisableUserChange ./xserver-autologin-module.nix;
|
||||||
|
|
||||||
systemPackages = [
|
systemPackages = [
|
||||||
|
|
|
@ -10,6 +10,8 @@ let
|
||||||
} // profileSettings.params);
|
} // profileSettings.params);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit (profileSettings) params;
|
||||||
|
|
||||||
nixosModules = [];
|
nixosModules = [];
|
||||||
|
|
||||||
systemPackages = [
|
systemPackages = [
|
||||||
|
|
|
@ -24,7 +24,7 @@ let
|
||||||
|
|
||||||
processesArgs = builtins.intersectAttrs processesFormalArgs ({
|
processesArgs = builtins.intersectAttrs processesFormalArgs ({
|
||||||
inherit pkgs system processManager;
|
inherit pkgs system processManager;
|
||||||
} // profileSettings.params // extraParams);
|
} // processManagerSettings.params // extraParams);
|
||||||
|
|
||||||
processes = processesFun processesArgs;
|
processes = processesFun processesArgs;
|
||||||
in
|
in
|
||||||
|
@ -60,14 +60,14 @@ let
|
||||||
''
|
''
|
||||||
+ processManagerSettings.deployProcessManager
|
+ processManagerSettings.deployProcessManager
|
||||||
+ processManagerSettings.deploySystem
|
+ processManagerSettings.deploySystem
|
||||||
+ pkgs.lib.optionalString (initialTests != null) (initialTests profileSettings.params)
|
+ pkgs.lib.optionalString (initialTests != null) (initialTests processManagerSettings.params)
|
||||||
|
|
||||||
# Execute readiness check for all process instances
|
# Execute readiness check for all process instances
|
||||||
+ pkgs.lib.concatMapStrings (instanceName:
|
+ pkgs.lib.concatMapStrings (instanceName:
|
||||||
let
|
let
|
||||||
instance = builtins.getAttr instanceName processes;
|
instance = builtins.getAttr instanceName processes;
|
||||||
in
|
in
|
||||||
readiness ({ inherit instanceName instance; } // profileSettings.params)
|
readiness ({ inherit instanceName instance; } // processManagerSettings.params)
|
||||||
) (builtins.attrNames processes)
|
) (builtins.attrNames processes)
|
||||||
|
|
||||||
# Execute tests for all process instances
|
# Execute tests for all process instances
|
||||||
|
@ -75,7 +75,7 @@ let
|
||||||
let
|
let
|
||||||
instance = builtins.getAttr instanceName processes;
|
instance = builtins.getAttr instanceName processes;
|
||||||
in
|
in
|
||||||
tests ({ inherit instanceName instance; } // profileSettings.params)
|
tests ({ inherit instanceName instance; } // processManagerSettings.params)
|
||||||
) (builtins.attrNames processes);
|
) (builtins.attrNames processes);
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in New Issue