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

Implementing missing cygrunsrv properties

This commit is contained in:
Sander van der Burg 2021-03-28 16:39:16 +02:00 committed by Sander van der Burg
parent 5384e7bb51
commit dea82c9680
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixproc/backends/cygrunsrv/generate-cygrunsrv-params.nix
View File

@ -26,12 +26,6 @@
, postInstall
}:
# TODO: credentials
# TODO: directory unused
# TODO: umask unused
# TODO: nice unused
# TODO: user unused
let
generateForegroundProxy = import ../util/generate-foreground-proxy.nix {
inherit stdenv lib writeTextFile;
@ -43,16 +37,16 @@ let
environmentPath = path;
path = if foregroundProcess != null then
if initialize == "" then foregroundProcess
if initialize == "" && nice == null && directory == null && umask == null then foregroundProcess
else generateForegroundProxy {
wrapDaemon = false;
executable = foregroundProcess;
inherit name initialize runtimeDir pidFile stdenv;
inherit name initialize runtimeDir pidFile nice directory umask stdenv;
}
else generateForegroundProxy {
wrapDaemon = true;
executable = daemon;
inherit name initialize runtimeDir pidFile stdenv;
inherit name initialize runtimeDir pidFile nice stdenv;
};
args = if foregroundProcess != null then foregroundProcessArgs else daemonArgs;
@ -61,5 +55,8 @@ let
targetSpecificArgs =
if builtins.isFunction overrides then overrides generatedTargetSpecificArgs
else lib.recursiveUpdate generatedTargetSpecificArgs overrides;
cygrunSrvConfig = createCygrunsrvParams targetSpecificArgs;
in
createCygrunsrvParams targetSpecificArgs
if credentials == {} && user == null then cygrunSrvConfig else
builtins.trace "It is not possible to create any users for cygrunsrv services. Cygwin automatically converts Windows users to UNIX users" cygrunSrvConfig

9
nixproc/backends/util/generate-foreground-proxy.nix
View File

@ -10,6 +10,8 @@
, pidFile ? (if instanceName == null then null else "${runtimeDir}/${instanceName}.pid")
, user ? null
, nice ? null
, directory ? null
, umask ? null
}:
let
@ -43,6 +45,13 @@ writeTextFile {
trap _term SIGTERM
trap _interrupt SIGINT
${lib.optionalString (directory != null) ''
cd ${directory}
''}
${lib.optionalString (umask != null) ''
umask ${umask}
''}
# Start process in the background as a daemon
${lib.optionalString (user != null) "${chainload-user}/bin/nixproc-chainload-user ${user} "}${lib.optionalString (nice != null) "nice -n ${nice} "}${executable} "$@"