ehmry
/
nix-processmgmt-services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Propagate the correct variant of the Nix process management framework as a parameter

This commit is contained in:
Sander van der Burg 2021-04-23 21:39:52 +02:00 committed by Sander van der Burg
parent 400d19786d
commit 6640648dfd
47 changed files with 165 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example-deployments/disnix/processes-bare.nix
View File

@ -10,13 +10,14 @@
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, enablePAM ? false , enablePAM ? false
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
ids = if builtins.pathExists ./ids-bare.nix then (import ./ids-bare.nix).ids else {}; ids = if builtins.pathExists ./ids-bare.nix then (import ./ids-bare.nix).ids else {};
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
example-deployments/disnix/processes-with-apache-mysql.nix
View File

@ -10,17 +10,18 @@
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, enablePAM ? false , enablePAM ? false
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
ids = if builtins.pathExists ./ids-apache-mysql.nix then (import ./ids-apache-mysql.nix).ids else {}; ids = if builtins.pathExists ./ids-apache-mysql.nix then (import ./ids-apache-mysql.nix).ids else {};
constructors = import ../../services-agnostic/constructors.nix { 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 { 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 in
rec { rec {

5
example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix
View File

@ -10,17 +10,18 @@
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, enablePAM ? false , enablePAM ? false
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
ids = if builtins.pathExists ./ids-tomcat-mysql-multi-instance.nix then (import ./ids-tomcat-mysql-multi-instance.nix).ids else {}; 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 { 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 { 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 in
rec { rec {

5
example-deployments/disnix/processes-with-tomcat-mysql.nix
View File

@ -10,17 +10,18 @@
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, enablePAM ? false , enablePAM ? false
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
ids = if builtins.pathExists ./ids-tomcat-mysql.nix then (import ./ids-tomcat-mysql.nix).ids else {}; ids = if builtins.pathExists ./ids-tomcat-mysql.nix then (import ./ids-tomcat-mysql.nix).ids else {};
constructors = import ../../services-agnostic/constructors.nix { 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 { 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 in
rec { rec {

3
example-deployments/hydra/processes.nix
View File

@ -10,11 +10,12 @@
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, includeNixDaemon ? false , includeNixDaemon ? false
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 = ""; instanceSuffix = "";

3
release.nix
View File

@ -5,9 +5,6 @@
, profiles ? [ "privileged" "unprivileged" ] , profiles ? [ "privileged" "unprivileged" ]
}: }:
let
pkgs = import nixpkgs {};
in
{ {
tests = import ./tests { tests = import ./tests {
inherit nixpkgs system nix-processmgmt processManagers profiles; inherit nixpkgs system nix-processmgmt processManagers profiles;

5
tests/apache-tomcat-ajp-reverse-proxy/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
readiness = {instanceName, instance, stateDir, ...}: readiness = {instanceName, instance, stateDir, ...}:
if instanceName == "tomcat" then '' if instanceName == "tomcat" then ''

3
tests/apache-tomcat-ajp-reverse-proxy/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/apache-tomcat/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
nixosConfig = { nixosConfig = {
virtualisation.diskSize = 8192; virtualisation.diskSize = 8192;

3
tests/apache-tomcat/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/apache/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:
'' ''

3
tests/apache/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 { webappStatic = pkgs.stdenv.mkDerivation {

44
tests/default.nix
View File

@ -14,59 +14,59 @@ let
in in
{ {
apache = import ./apache { apache = import ./apache {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
apache-tomcat = import ./apache-tomcat { 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 { 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 { disnix = import ./disnix/bare {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
disnix-with-apache-mysql = import ./disnix/apache-mysql { 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 { 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 { 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 { docker = import ./docker {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
fcron = import ./fcron { fcron = import ./fcron {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
hydra = import ./hydra { hydra = import ./hydra {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
influxdb = import ./influxdb { influxdb = import ./influxdb {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
mongodb = import ./mongodb { mongodb = import ./mongodb {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
mysql = import ./mysql { mysql = import ./mysql {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
nginx = import ./nginx/simple-webapp { 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 { nginx-reverse-proxy-hostbased = import ./nginx/reverse-proxy-hostbased {
@ -74,34 +74,34 @@ in
}; };
nginx-reverse-proxy-pathbased = import ./nginx/reverse-proxy-pathbased { nginx-reverse-proxy-pathbased = import ./nginx/reverse-proxy-pathbased {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
postgresql = import ./postgresql { postgresql = import ./postgresql {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
s6-svscan = import ./s6-svscan { s6-svscan = import ./s6-svscan {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
sshd = import ./sshd { sshd = import ./sshd {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
supervisord = import ./supervisord { supervisord = import ./supervisord {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
svnserve = import ./svnserve { svnserve = import ./svnserve {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
xinetd = import ./xinetd/declarative { xinetd = import ./xinetd/declarative {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
xinetd-extendable = import ./xinetd/extendable { xinetd-extendable = import ./xinetd/extendable {
inherit pkgs processManagers profiles testService; inherit pkgs processManagers profiles testService nix-processmgmt;
}; };
} }

5
tests/disnix/apache-mysql/default.nix
View File

@ -1,10 +1,13 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client"; env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client";
in in
testService { testService {
exprFile = ../../../example-deployments/disnix/processes-with-apache-mysql.nix; exprFile = ../../../example-deployments/disnix/processes-with-apache-mysql.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.disnix ]; systemPackages = [ pkgs.disnix ];
initialTests = {forceDisableUserChange, ...}: initialTests = {forceDisableUserChange, ...}:

5
tests/disnix/bare/default.nix
View File

@ -1,10 +1,13 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client"; env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client";
in in
testService { testService {
exprFile = ../../../example-deployments/disnix/processes-bare.nix; exprFile = ../../../example-deployments/disnix/processes-bare.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.disnix ]; systemPackages = [ pkgs.disnix ];
initialTests = {forceDisableUserChange, ...}: initialTests = {forceDisableUserChange, ...}:

5
tests/disnix/tomcat-mysql-multi-instance/default.nix
View File

@ -1,10 +1,13 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client"; env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client";
in in
testService { testService {
exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix; exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.disnix ]; systemPackages = [ pkgs.disnix ];
initialTests = {forceDisableUserChange, ...}: initialTests = {forceDisableUserChange, ...}:

5
tests/disnix/tomcat-mysql/default.nix
View File

@ -1,10 +1,13 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
env = "NIX_PATH='nixpkgs=${<nixpkgs>}' DISNIX_CLIENT_INTERFACE=disnix-soap-client DISNIX_TARGET_PROPERTY=targetEPR DISNIX_SOAP_CLIENT_USERNAME=admin DISNIX_SOAP_CLIENT_PASSWORD=secret"; env = "NIX_PATH='nixpkgs=${<nixpkgs>}' DISNIX_CLIENT_INTERFACE=disnix-soap-client DISNIX_TARGET_PROPERTY=targetEPR DISNIX_SOAP_CLIENT_USERNAME=admin DISNIX_SOAP_CLIENT_PASSWORD=secret";
in in
testService { testService {
exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql.nix; exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.disnix pkgs.DisnixWebService ]; systemPackages = [ pkgs.disnix pkgs.DisnixWebService ];
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:

5
tests/docker/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.docker ]; systemPackages = [ pkgs.docker ];
readiness = {instanceName, instance, runtimeDir, ...}: readiness = {instanceName, instance, runtimeDir, ...}:

3
tests/docker/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

9
tests/fcron/default.nix
View File

@ -1,11 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
readiness = {instanceName, instance, ...}: inherit nix-processmgmt;
'' };
'';
tests = {instanceName, instance, ...}: tests = {instanceName, instance, ...}:
'' ''

3
tests/fcron/processes.nix
View File

@ -11,11 +11,12 @@
, callingUser ? null , callingUser ? null
, callingGroup ? null , callingGroup ? null
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

10
tests/hydra/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
node-hydra-connector = (import ./nodepkgs { node-hydra-connector = (import ./nodepkgs {
@ -63,6 +63,9 @@ let
in in
testService { testService {
exprFile = ../../example-deployments/hydra/processes.nix; exprFile = ../../example-deployments/hydra/processes.nix;
extraParams = {
inherit nix-processmgmt;
};
nixosConfig = { nixosConfig = {
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
virtualisation.diskSize = 8192; 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;
} }

5
tests/influxdb/default.nix
View File

@ -1,8 +1,11 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
systemPackages = [ pkgs.influxdb ]; systemPackages = [ pkgs.influxdb ];
extraParams = {
inherit nix-processmgmt;
};
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:
'' ''

3
tests/influxdb/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

6
tests/mongodb/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
@ -7,6 +7,10 @@ testService {
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
virtualisation.diskSize = 8192; virtualisation.diskSize = 8192;
}; };
extraParams = {
inherit nix-processmgmt;
};
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:
'' ''
machine.wait_for_open_port(${toString instance.port}) machine.wait_for_open_port(${toString instance.port})

3
tests/mongodb/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/mysql/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.mysql ]; systemPackages = [ pkgs.mysql ];
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:

3
tests/mysql/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

4
tests/nginx/reverse-proxy-hostbased/processes.nix
View File

@ -1,6 +1,5 @@
{ pkgs ? import <nixpkgs> { inherit system; } { pkgs ? import <nixpkgs> { inherit system; }
, system ? builtins.currentSystem , system ? builtins.currentSystem
, nix-processmgmt
, stateDir ? "/var" , stateDir ? "/var"
, runtimeDir ? "${stateDir}/run" , runtimeDir ? "${stateDir}/run"
, logDir ? "${stateDir}/log" , logDir ? "${stateDir}/log"
@ -10,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../../nix-processmgmt
}: }:
let let
sharedConstructors = import ../../../services-agnostic/constructors.nix { 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" { constructors = import "${nix-processmgmt}/examples/webapps-agnostic/constructors/constructors.nix" {

6
tests/nginx/reverse-proxy-pathbased/default.nix
View File

@ -1,7 +1,11 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
nixosConfig = { nixosConfig = {
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
}; };

3
tests/nginx/reverse-proxy-pathbased/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../../services-agnostic/constructors.nix { 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 { webappStatic = pkgs.stdenv.mkDerivation {

5
tests/nginx/simple-webapp/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:
'' ''

3
tests/nginx/simple-webapp/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../../services-agnostic/constructors.nix { 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 { webappStatic = from: pkgs.stdenv.mkDerivation {

5
tests/postgresql/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.postgresql ]; systemPackages = [ pkgs.postgresql ];
nixosConfig = { nixosConfig = {
virtualisation.diskSize = 8192; virtualisation.diskSize = 8192;

3
tests/postgresql/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/s6-svscan/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
generateTestExecutable = instanceName: generateTestExecutable = instanceName:
@ -42,6 +42,9 @@ let
in in
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.s6-rc ]; systemPackages = [ pkgs.s6-rc ];
readiness = {instanceName, instance, runtimeDir, ...}: readiness = {instanceName, instance, runtimeDir, ...}:

3
tests/s6-svscan/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/sshd/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.openssh ]; systemPackages = [ pkgs.openssh ];
initialTests = {forceDisableUserChange, ...}: initialTests = {forceDisableUserChange, ...}:

3
tests/sshd/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/supervisord/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
let let
generateTestExecutable = instanceName: generateTestExecutable = instanceName:
@ -27,6 +27,9 @@ let
in in
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.pythonPackages.supervisor ]; systemPackages = [ pkgs.pythonPackages.supervisor ];
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:

3
tests/supervisord/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/svnserve/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.subversion ]; systemPackages = [ pkgs.subversion ];
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:

3
tests/svnserve/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../nix-processmgmt
}: }:
let let
constructors = import ../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/xinetd/declarative/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.inetutils ]; systemPackages = [ pkgs.inetutils ];
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:

3
tests/xinetd/declarative/processes.nix
View File

@ -10,11 +10,12 @@
, forceDisableUserChange ? false , forceDisableUserChange ? false
, callingUser ? null , callingUser ? null
, processManager , processManager
, nix-processmgmt ? ../../../../nix-processmgmt
}: }:
let let
constructors = import ../../../services-agnostic/constructors.nix { 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 in
rec { rec {

5
tests/xinetd/extendable/default.nix
View File

@ -1,7 +1,10 @@
{ pkgs, testService, processManagers, profiles }: { pkgs, testService, processManagers, profiles, nix-processmgmt }:
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
extraParams = {
inherit nix-processmgmt;
};
systemPackages = [ pkgs.inetutils ]; systemPackages = [ pkgs.inetutils ];
tests = {instanceName, instance, stateDir, runtimeDir, forceDisableUserChange, ...}: tests = {instanceName, instance, stateDir, runtimeDir, forceDisableUserChange, ...}:

3
tests/xinetd/extendable/processes.nix
View File

@ -9,11 +9,12 @@
, tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp") , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
, forceDisableUserChange ? false , forceDisableUserChange ? false
, processManager , processManager
, nix-processmgmt ? ../../../../nix-processmgmt
}: }:
let let
constructors = import ../../../services-agnostic/constructors.nix { 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 in
rec { rec {