public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected dependencies for gw6c; also made httpd depend on gw6c if needed.

Browse Source 
svn path=/nixos/trunk/; revision=9029
This commit is contained in:
Michael Raskin 2007-08-02 21:26:38 +00:00
parent 333d0dfe17
commit 8843f3c287
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upstart-jobs/gw6c.nix
View File

@ -17,8 +17,8 @@ in
job = " job = "
description \"Gateway6 client\" description \"Gateway6 client\"
start on network/interfaces started start on network-interfaces/started
stop on network/interfaces stop stop on network-interfaces/stop
respawn ${gw6cService}/bin/control start respawn ${gw6cService}/bin/control start
"; ";

7
upstart-jobs/httpd.nix
View File

@ -22,6 +22,9 @@ let
enableSSL = false; enableSSL = false;
noUserDir = getCfg "noUserDir"; noUserDir = getCfg "noUserDir";
extraDirectories = getCfg "extraDirectories"; extraDirectories = getCfg "extraDirectories";
startingDependency = if (config.get [ "services" "gw6c" "enable" ])
then "gw6c" else "network-interfaces";
webServer = import ../services/apache-httpd { webServer = import ../services/apache-httpd {
inherit (pkgs) apacheHttpd coreutils; inherit (pkgs) apacheHttpd coreutils;
@ -99,8 +102,8 @@ in
job = " job = "
description \"Apache HTTPD\" description \"Apache HTTPD\"
start on network-interfaces/started start on ${startingDependency}/started
stop on network-interfaces/stop stop on ${startingDependency}/stop
start script start script
${webServer}/bin/control prepare ${webServer}/bin/control prepare