diff --git a/example-deployments/disnix/processes-bare.nix b/example-deployments/disnix/processes-bare.nix index ada22b6..3c9a99d 100644 --- a/example-deployments/disnix/processes-bare.nix +++ b/example-deployments/disnix/processes-bare.nix @@ -10,13 +10,14 @@ , forceDisableUserChange ? false , processManager , enablePAM ? false +, nix-processmgmt ? ../../../nix-processmgmt }: 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 libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; in rec { diff --git a/example-deployments/disnix/processes-with-apache-mysql.nix b/example-deployments/disnix/processes-with-apache-mysql.nix index 5436aa3..7b289d0 100644 --- a/example-deployments/disnix/processes-with-apache-mysql.nix +++ b/example-deployments/disnix/processes-with-apache-mysql.nix @@ -10,17 +10,18 @@ , forceDisableUserChange ? false , processManager , enablePAM ? false +, nix-processmgmt ? ../../../nix-processmgmt }: 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 libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; 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 a001f2e..8082962 100644 --- a/example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix +++ b/example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix @@ -10,17 +10,18 @@ , forceDisableUserChange ? false , processManager , enablePAM ? false +, nix-processmgmt ? ../../../nix-processmgmt }: 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 libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; in rec { diff --git a/example-deployments/disnix/processes-with-tomcat-mysql.nix b/example-deployments/disnix/processes-with-tomcat-mysql.nix index 156f72c..bc4ab7c 100644 --- a/example-deployments/disnix/processes-with-tomcat-mysql.nix +++ b/example-deployments/disnix/processes-with-tomcat-mysql.nix @@ -10,17 +10,18 @@ , forceDisableUserChange ? false , processManager , enablePAM ? false +, nix-processmgmt ? ../../../nix-processmgmt }: 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 libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt; }; in rec { diff --git a/example-deployments/hydra/processes.nix b/example-deployments/hydra/processes.nix index 3a2890d..e26bb92 100644 --- a/example-deployments/hydra/processes.nix +++ b/example-deployments/hydra/processes.nix @@ -10,11 +10,12 @@ , forceDisableUserChange ? false , processManager , includeNixDaemon ? false +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt; }; instanceSuffix = ""; diff --git a/release.nix b/release.nix index 87def61..29d248f 100644 --- a/release.nix +++ b/release.nix @@ -5,9 +5,6 @@ , profiles ? [ "privileged" "unprivileged" ] }: -let - pkgs = import nixpkgs {}; -in { tests = import ./tests { inherit nixpkgs system nix-processmgmt processManagers profiles; diff --git a/tests/apache-tomcat-ajp-reverse-proxy/default.nix b/tests/apache-tomcat-ajp-reverse-proxy/default.nix index 1d79841..6e2ab02 100644 --- a/tests/apache-tomcat-ajp-reverse-proxy/default.nix +++ b/tests/apache-tomcat-ajp-reverse-proxy/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; readiness = {instanceName, instance, stateDir, ...}: if instanceName == "tomcat" then '' diff --git a/tests/apache-tomcat-ajp-reverse-proxy/processes.nix b/tests/apache-tomcat-ajp-reverse-proxy/processes.nix index 1eefbba..4263eae 100644 --- a/tests/apache-tomcat-ajp-reverse-proxy/processes.nix +++ b/tests/apache-tomcat-ajp-reverse-proxy/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/apache-tomcat/default.nix b/tests/apache-tomcat/default.nix index 373ccf2..279bf7d 100644 --- a/tests/apache-tomcat/default.nix +++ b/tests/apache-tomcat/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; nixosConfig = { virtualisation.diskSize = 8192; diff --git a/tests/apache-tomcat/processes.nix b/tests/apache-tomcat/processes.nix index f9ce72a..a236b3b 100644 --- a/tests/apache-tomcat/processes.nix +++ b/tests/apache-tomcat/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/apache/default.nix b/tests/apache/default.nix index e111377..744f8b9 100644 --- a/tests/apache/default.nix +++ b/tests/apache/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; readiness = {instanceName, instance, ...}: '' diff --git a/tests/apache/processes.nix b/tests/apache/processes.nix index 25e4bbe..6ac6b62 100644 --- a/tests/apache/processes.nix +++ b/tests/apache/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; webappStatic = pkgs.stdenv.mkDerivation { diff --git a/tests/default.nix b/tests/default.nix index 3dd3aa8..829fa32 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -14,59 +14,59 @@ let in { apache = import ./apache { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; apache-tomcat = import ./apache-tomcat { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; apache-tomcat-ajp-reverse-proxy = import ./apache-tomcat-ajp-reverse-proxy { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; disnix = import ./disnix/bare { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; disnix-with-apache-mysql = import ./disnix/apache-mysql { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; disnix-with-tomcat-mysql = import ./disnix/tomcat-mysql { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; disnix-with-tomcat-mysql-multi-instance = import ./disnix/tomcat-mysql-multi-instance { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; docker = import ./docker { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; fcron = import ./fcron { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; hydra = import ./hydra { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; influxdb = import ./influxdb { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; mongodb = import ./mongodb { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; mysql = import ./mysql { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; nginx = import ./nginx/simple-webapp { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; nginx-reverse-proxy-hostbased = import ./nginx/reverse-proxy-hostbased { @@ -74,34 +74,34 @@ in }; nginx-reverse-proxy-pathbased = import ./nginx/reverse-proxy-pathbased { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; postgresql = import ./postgresql { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; s6-svscan = import ./s6-svscan { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; sshd = import ./sshd { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; supervisord = import ./supervisord { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; svnserve = import ./svnserve { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; xinetd = import ./xinetd/declarative { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; xinetd-extendable = import ./xinetd/extendable { - inherit pkgs processManagers profiles testService; + inherit pkgs processManagers profiles testService nix-processmgmt; }; } diff --git a/tests/disnix/apache-mysql/default.nix b/tests/disnix/apache-mysql/default.nix index a6f5970..99470d7 100644 --- a/tests/disnix/apache-mysql/default.nix +++ b/tests/disnix/apache-mysql/default.nix @@ -1,10 +1,13 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let env = "NIX_PATH='nixpkgs=${}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client"; in testService { exprFile = ../../../example-deployments/disnix/processes-with-apache-mysql.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.disnix ]; initialTests = {forceDisableUserChange, ...}: diff --git a/tests/disnix/bare/default.nix b/tests/disnix/bare/default.nix index 79244d7..cfa5e12 100644 --- a/tests/disnix/bare/default.nix +++ b/tests/disnix/bare/default.nix @@ -1,10 +1,13 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let env = "NIX_PATH='nixpkgs=${}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client"; in testService { exprFile = ../../../example-deployments/disnix/processes-bare.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.disnix ]; initialTests = {forceDisableUserChange, ...}: diff --git a/tests/disnix/tomcat-mysql-multi-instance/default.nix b/tests/disnix/tomcat-mysql-multi-instance/default.nix index 15c6a38..41b18c5 100644 --- a/tests/disnix/tomcat-mysql-multi-instance/default.nix +++ b/tests/disnix/tomcat-mysql-multi-instance/default.nix @@ -1,10 +1,13 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let env = "NIX_PATH='nixpkgs=${}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client"; in testService { exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.disnix ]; initialTests = {forceDisableUserChange, ...}: diff --git a/tests/disnix/tomcat-mysql/default.nix b/tests/disnix/tomcat-mysql/default.nix index d45c5a0..2e8291f 100644 --- a/tests/disnix/tomcat-mysql/default.nix +++ b/tests/disnix/tomcat-mysql/default.nix @@ -1,10 +1,13 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let env = "NIX_PATH='nixpkgs=${}' DISNIX_CLIENT_INTERFACE=disnix-soap-client DISNIX_TARGET_PROPERTY=targetEPR DISNIX_SOAP_CLIENT_USERNAME=admin DISNIX_SOAP_CLIENT_PASSWORD=secret"; in testService { exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.disnix pkgs.DisnixWebService ]; readiness = {instanceName, instance, ...}: diff --git a/tests/docker/default.nix b/tests/docker/default.nix index f0446d5..f276835 100644 --- a/tests/docker/default.nix +++ b/tests/docker/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.docker ]; readiness = {instanceName, instance, runtimeDir, ...}: diff --git a/tests/docker/processes.nix b/tests/docker/processes.nix index 4f839e7..1e9bfe7 100644 --- a/tests/docker/processes.nix +++ b/tests/docker/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/fcron/default.nix b/tests/fcron/default.nix index 05a3280..298da80 100644 --- a/tests/fcron/default.nix +++ b/tests/fcron/default.nix @@ -1,11 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; - - readiness = {instanceName, instance, ...}: - '' - ''; + extraParams = { + inherit nix-processmgmt; + }; tests = {instanceName, instance, ...}: '' diff --git a/tests/fcron/processes.nix b/tests/fcron/processes.nix index 330e09f..ead2caf 100644 --- a/tests/fcron/processes.nix +++ b/tests/fcron/processes.nix @@ -11,11 +11,12 @@ , callingUser ? null , callingGroup ? null , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange callingUser callingGroup processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange callingUser callingGroup processManager nix-processmgmt; }; in rec { diff --git a/tests/hydra/default.nix b/tests/hydra/default.nix index 6f5f7ef..0bb1538 100644 --- a/tests/hydra/default.nix +++ b/tests/hydra/default.nix @@ -1,4 +1,4 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let node-hydra-connector = (import ./nodepkgs { @@ -63,6 +63,9 @@ let in testService { exprFile = ../../example-deployments/hydra/processes.nix; + extraParams = { + inherit nix-processmgmt; + }; nixosConfig = { virtualisation.memorySize = 1024; virtualisation.diskSize = 8192; @@ -161,5 +164,8 @@ testService { ) ''; - inherit processManagers profiles; + inherit processManagers; + + # We don't support unprivileged user deployments + profiles = builtins.filter (profile: profile == "privileged") profiles; } diff --git a/tests/influxdb/default.nix b/tests/influxdb/default.nix index d6ef5b2..9e9b774 100644 --- a/tests/influxdb/default.nix +++ b/tests/influxdb/default.nix @@ -1,8 +1,11 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; systemPackages = [ pkgs.influxdb ]; + extraParams = { + inherit nix-processmgmt; + }; readiness = {instanceName, instance, ...}: '' diff --git a/tests/influxdb/processes.nix b/tests/influxdb/processes.nix index 65ebbf2..9098511 100644 --- a/tests/influxdb/processes.nix +++ b/tests/influxdb/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/mongodb/default.nix b/tests/mongodb/default.nix index 249656c..d087355 100644 --- a/tests/mongodb/default.nix +++ b/tests/mongodb/default.nix @@ -1,4 +1,4 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; @@ -7,6 +7,10 @@ testService { virtualisation.memorySize = 1024; virtualisation.diskSize = 8192; }; + extraParams = { + inherit nix-processmgmt; + }; + readiness = {instanceName, instance, ...}: '' machine.wait_for_open_port(${toString instance.port}) diff --git a/tests/mongodb/processes.nix b/tests/mongodb/processes.nix index 3b67050..9863b6f 100644 --- a/tests/mongodb/processes.nix +++ b/tests/mongodb/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/mysql/default.nix b/tests/mysql/default.nix index 2e4a6a9..90d0def 100644 --- a/tests/mysql/default.nix +++ b/tests/mysql/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.mysql ]; readiness = {instanceName, instance, ...}: diff --git a/tests/mysql/processes.nix b/tests/mysql/processes.nix index 4ef7a66..fb9d529 100644 --- a/tests/mysql/processes.nix +++ b/tests/mysql/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/nginx/reverse-proxy-hostbased/processes.nix b/tests/nginx/reverse-proxy-hostbased/processes.nix index 8a0bb87..325bab9 100644 --- a/tests/nginx/reverse-proxy-hostbased/processes.nix +++ b/tests/nginx/reverse-proxy-hostbased/processes.nix @@ -1,6 +1,5 @@ { pkgs ? import { inherit system; } , system ? builtins.currentSystem -, nix-processmgmt , stateDir ? "/var" , runtimeDir ? "${stateDir}/run" , logDir ? "${stateDir}/log" @@ -10,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../../nix-processmgmt }: let sharedConstructors = import ../../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir cacheDir spoolDir libDir tmpDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir cacheDir spoolDir libDir tmpDir forceDisableUserChange processManager nix-processmgmt; }; constructors = import "${nix-processmgmt}/examples/webapps-agnostic/constructors/constructors.nix" { diff --git a/tests/nginx/reverse-proxy-pathbased/default.nix b/tests/nginx/reverse-proxy-pathbased/default.nix index 16903f2..107c17f 100644 --- a/tests/nginx/reverse-proxy-pathbased/default.nix +++ b/tests/nginx/reverse-proxy-pathbased/default.nix @@ -1,7 +1,11 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; + nixosConfig = { virtualisation.memorySize = 1024; }; diff --git a/tests/nginx/reverse-proxy-pathbased/processes.nix b/tests/nginx/reverse-proxy-pathbased/processes.nix index 29a6c46..32bfdde 100644 --- a/tests/nginx/reverse-proxy-pathbased/processes.nix +++ b/tests/nginx/reverse-proxy-pathbased/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; webappStatic = pkgs.stdenv.mkDerivation { diff --git a/tests/nginx/simple-webapp/default.nix b/tests/nginx/simple-webapp/default.nix index 00b218f..e217b2b 100644 --- a/tests/nginx/simple-webapp/default.nix +++ b/tests/nginx/simple-webapp/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; readiness = {instanceName, instance, ...}: '' diff --git a/tests/nginx/simple-webapp/processes.nix b/tests/nginx/simple-webapp/processes.nix index 19eeee6..09b82b1 100644 --- a/tests/nginx/simple-webapp/processes.nix +++ b/tests/nginx/simple-webapp/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; webappStatic = from: pkgs.stdenv.mkDerivation { diff --git a/tests/postgresql/default.nix b/tests/postgresql/default.nix index c8dbf07..c551975 100644 --- a/tests/postgresql/default.nix +++ b/tests/postgresql/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.postgresql ]; nixosConfig = { virtualisation.diskSize = 8192; diff --git a/tests/postgresql/processes.nix b/tests/postgresql/processes.nix index 0a503d9..b0b4b7d 100644 --- a/tests/postgresql/processes.nix +++ b/tests/postgresql/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/s6-svscan/default.nix b/tests/s6-svscan/default.nix index d198cdb..6f75223 100644 --- a/tests/s6-svscan/default.nix +++ b/tests/s6-svscan/default.nix @@ -1,4 +1,4 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let generateTestExecutable = instanceName: @@ -42,6 +42,9 @@ let in testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.s6-rc ]; readiness = {instanceName, instance, runtimeDir, ...}: diff --git a/tests/s6-svscan/processes.nix b/tests/s6-svscan/processes.nix index 777fccc..d38ad8d 100644 --- a/tests/s6-svscan/processes.nix +++ b/tests/s6-svscan/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/sshd/default.nix b/tests/sshd/default.nix index 622ce2a..a59554e 100644 --- a/tests/sshd/default.nix +++ b/tests/sshd/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.openssh ]; initialTests = {forceDisableUserChange, ...}: diff --git a/tests/sshd/processes.nix b/tests/sshd/processes.nix index e4fd29f..03a660f 100644 --- a/tests/sshd/processes.nix +++ b/tests/sshd/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/supervisord/default.nix b/tests/supervisord/default.nix index ff5891d..44f2a4d 100644 --- a/tests/supervisord/default.nix +++ b/tests/supervisord/default.nix @@ -1,4 +1,4 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: let generateTestExecutable = instanceName: @@ -27,6 +27,9 @@ let in testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.pythonPackages.supervisor ]; readiness = {instanceName, instance, ...}: diff --git a/tests/supervisord/processes.nix b/tests/supervisord/processes.nix index 709c1d0..0233881 100644 --- a/tests/supervisord/processes.nix +++ b/tests/supervisord/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/svnserve/default.nix b/tests/svnserve/default.nix index e18f132..bca104a 100644 --- a/tests/svnserve/default.nix +++ b/tests/svnserve/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.subversion ]; readiness = {instanceName, instance, ...}: diff --git a/tests/svnserve/processes.nix b/tests/svnserve/processes.nix index 22dee2e..aa5e845 100644 --- a/tests/svnserve/processes.nix +++ b/tests/svnserve/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../nix-processmgmt }: let constructors = import ../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/xinetd/declarative/default.nix b/tests/xinetd/declarative/default.nix index 6596361..a3532b2 100644 --- a/tests/xinetd/declarative/default.nix +++ b/tests/xinetd/declarative/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.inetutils ]; readiness = {instanceName, instance, ...}: diff --git a/tests/xinetd/declarative/processes.nix b/tests/xinetd/declarative/processes.nix index 097fd82..4df67f6 100644 --- a/tests/xinetd/declarative/processes.nix +++ b/tests/xinetd/declarative/processes.nix @@ -10,11 +10,12 @@ , forceDisableUserChange ? false , callingUser ? null , processManager +, nix-processmgmt ? ../../../../nix-processmgmt }: let constructors = import ../../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec { diff --git a/tests/xinetd/extendable/default.nix b/tests/xinetd/extendable/default.nix index bb5203f..e493f09 100644 --- a/tests/xinetd/extendable/default.nix +++ b/tests/xinetd/extendable/default.nix @@ -1,7 +1,10 @@ -{ pkgs, testService, processManagers, profiles }: +{ pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { exprFile = ./processes.nix; + extraParams = { + inherit nix-processmgmt; + }; systemPackages = [ pkgs.inetutils ]; tests = {instanceName, instance, stateDir, runtimeDir, forceDisableUserChange, ...}: diff --git a/tests/xinetd/extendable/processes.nix b/tests/xinetd/extendable/processes.nix index 3f85edf..cfebfd5 100644 --- a/tests/xinetd/extendable/processes.nix +++ b/tests/xinetd/extendable/processes.nix @@ -9,11 +9,12 @@ , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , forceDisableUserChange ? false , processManager +, nix-processmgmt ? ../../../../nix-processmgmt }: let constructors = import ../../../services-agnostic/constructors.nix { - inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager; + inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt; }; in rec {