kiberpipa/nix-rehash
1
1
Fork 0
mirror of https://github.com/kiberpipa/nix-rehash.git synced 2024-10-03 22:57:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6 from wmertens/patch-1

Browse Source 
supervisord: shell wrapper improvements
This commit is contained in:
Jaka Hudoklin 2014-12-06 18:57:33 +01:00
commit d14e37eb26
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nix-services/supervisord.nix
View File

@ -50,15 +50,15 @@ let
export PATH="${pkgs.coreutils}/bin"
# Run start scripts first
${config.userNix.startScript}
"${config.userNix.startScript}"
# Run supervisord
${supervisor}/bin/supervisord -c ${config.supervisord.configFile} $extraFlags $@
exec ${supervisor}/bin/supervisord -c "${config.supervisord.configFile}" $extraFlags "$@"
'';
supervisorctlWrapper = pkgs.writeScript "supervisorctl-wrapper" ''
#!/usr/bin/env bash
${supervisor}/bin/supervisorctl -c ${config.supervisord.configFile} $@
#!${pkgs.stdenv.shell}
exec ${supervisor}/bin/supervisorctl -c "${config.supervisord.configFile}" "$@"
'';
in {
@ -136,7 +136,7 @@ in {
${concatMapStrings (name:
let
cfg = getAttr name services;
path = if isList cfg.path then concatStringsSep ":" cfg.path else cfg.path;
path = if isList cfg.path then concatStringsSep ":" cfg.path else cfg.path;
in
''
[program:${name}]
@ -165,12 +165,12 @@ in {
installPhase = ''
mkdir -p $out/bin/
ln -s -T ${supervisordWrapper} $out/bin/supervisord
ln -s -T ${supervisorctlWrapper} $out/bin/supervisorctl
cp ${supervisordWrapper} $out/bin/supervisord
cp ${supervisorctlWrapper} $out/bin/supervisorctl
'';
};
};
}