mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-14 23:17:48 +00:00
Corrected dependencies for gw6c; also made httpd depend on gw6c if needed.
svn path=/nixos/trunk/; revision=9029
This commit is contained in:
parent
333d0dfe17
commit
8843f3c287
@ -17,8 +17,8 @@ in
|
||||
job = "
|
||||
description \"Gateway6 client\"
|
||||
|
||||
start on network/interfaces started
|
||||
stop on network/interfaces stop
|
||||
start on network-interfaces/started
|
||||
stop on network-interfaces/stop
|
||||
|
||||
respawn ${gw6cService}/bin/control start
|
||||
";
|
||||
|
@ -22,6 +22,9 @@ let
|
||||
enableSSL = false;
|
||||
noUserDir = getCfg "noUserDir";
|
||||
extraDirectories = getCfg "extraDirectories";
|
||||
|
||||
startingDependency = if (config.get [ "services" "gw6c" "enable" ])
|
||||
then "gw6c" else "network-interfaces";
|
||||
|
||||
webServer = import ../services/apache-httpd {
|
||||
inherit (pkgs) apacheHttpd coreutils;
|
||||
@ -99,8 +102,8 @@ in
|
||||
job = "
|
||||
description \"Apache HTTPD\"
|
||||
|
||||
start on network-interfaces/started
|
||||
stop on network-interfaces/stop
|
||||
start on ${startingDependency}/started
|
||||
stop on ${startingDependency}/stop
|
||||
|
||||
start script
|
||||
${webServer}/bin/control prepare
|
||||
|
Loading…
Reference in New Issue
Block a user