diff --git a/example-deployments/disnix/processes-bare.nix b/example-deployments/disnix/processes-bare.nix index 8eb608e..1a22e05 100644 --- a/example-deployments/disnix/processes-bare.nix +++ b/example-deployments/disnix/processes-bare.nix @@ -5,6 +5,7 @@ , logDir ? "${stateDir}/log" , spoolDir ? "${stateDir}/spool" , cacheDir ? "${stateDir}/cache" +, libDir ? "${stateDir}/lib" , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager @@ -14,7 +15,7 @@ let ids = if builtins.pathExists ./ids-bare.nix then (import ./ids-bare.nix).ids else {}; constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; in rec { diff --git a/example-deployments/disnix/processes-with-apache-mysql.nix b/example-deployments/disnix/processes-with-apache-mysql.nix index 29417e7..963ba64 100644 --- a/example-deployments/disnix/processes-with-apache-mysql.nix +++ b/example-deployments/disnix/processes-with-apache-mysql.nix @@ -5,6 +5,7 @@ , logDir ? "${stateDir}/log" , spoolDir ? "${stateDir}/spool" , cacheDir ? "${stateDir}/cache" +, libDir ? "${stateDir}/lib" , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager @@ -14,11 +15,11 @@ let ids = if builtins.pathExists ./ids-apache-mysql.nix then (import ./ids-apache-mysql.nix).ids else {}; constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; in rec { diff --git a/example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix b/example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix index 2468aed..ba9071e 100644 --- a/example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix +++ b/example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix @@ -5,6 +5,7 @@ , logDir ? "${stateDir}/log" , spoolDir ? "${stateDir}/spool" , cacheDir ? "${stateDir}/cache" +, libDir ? "${stateDir}/lib" , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager @@ -14,11 +15,11 @@ let ids = if builtins.pathExists ./ids-tomcat-mysql-multi-instance.nix then (import ./ids-tomcat-mysql-multi-instance.nix).ids else {}; constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; in rec { diff --git a/example-deployments/disnix/processes-with-tomcat-mysql.nix b/example-deployments/disnix/processes-with-tomcat-mysql.nix index 4e85197..c2d94de 100644 --- a/example-deployments/disnix/processes-with-tomcat-mysql.nix +++ b/example-deployments/disnix/processes-with-tomcat-mysql.nix @@ -5,6 +5,7 @@ , logDir ? "${stateDir}/log" , spoolDir ? "${stateDir}/spool" , cacheDir ? "${stateDir}/cache" +, libDir ? "${stateDir}/lib" , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager @@ -14,11 +15,11 @@ let ids = if builtins.pathExists ./ids-tomcat-mysql.nix then (import ./ids-tomcat-mysql.nix).ids else {}; constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; in rec { diff --git a/example-deployments/hydra/processes.nix b/example-deployments/hydra/processes.nix index c6cefde..7851f5b 100644 --- a/example-deployments/hydra/processes.nix +++ b/example-deployments/hydra/processes.nix @@ -4,6 +4,7 @@ , runtimeDir ? "${stateDir}/run" , logDir ? "${stateDir}/log" , cacheDir ? "${stateDir}/cache" +, libDir ? "${stateDir}/lib" , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager @@ -11,7 +12,7 @@ let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir forceDisableUserChange processManager; }; instanceSuffix = ""; diff --git a/example-deployments/services/processes.nix b/example-deployments/services/processes.nix index 7a3d1fd..2e0bc28 100644 --- a/example-deployments/services/processes.nix +++ b/example-deployments/services/processes.nix @@ -5,6 +5,7 @@ , logDir ? "${stateDir}/log" , spoolDir ? "${stateDir}/spool" , cacheDir ? "${stateDir}/cache" +, libDir ? "${stateDir}/lib" , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager @@ -14,7 +15,7 @@ let ids = if builtins.pathExists ./ids.nix then (import ./ids.nix).ids else {}; constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; }; in rec {