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

changed the extraSubservices to a list of functions

Browse Source 
svn path=/nixos/trunk/; revision=7931
This commit is contained in:
Martin Bravenboer 2007-02-20 15:57:15 +00:00
parent a17b1d5c5f
commit e99ffcbe71
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/options.nix
View File

@ -588,7 +588,7 @@
{ {
name = ["services" "httpd" "extraSubservices" "services"]; name = ["services" "httpd" "extraSubservices" "services"];
default = false; default = [];
description = " description = "
Extra subservices to enable in the webserver. Extra subservices to enable in the webserver.
"; ";

6
upstart-jobs/httpd.nix
View File

@ -20,7 +20,6 @@ let
stateDir = getCfg "stateDir"; stateDir = getCfg "stateDir";
enableSSL = false; enableSSL = false;
webServer = import ../services/apache-httpd { webServer = import ../services/apache-httpd {
inherit (pkgs) stdenv apacheHttpd coreutils; inherit (pkgs) stdenv apacheHttpd coreutils;
@ -56,8 +55,9 @@ let
) )
++ ++
(optional (getCfgs ["extraSubservices" "enable"]) ( (optional (getCfgs ["extraSubservices" "enable"])
(getCfgs ["extraSubservices" "services"]) webServer pkgs (map (service : service webServer pkgs)
(getCfgs ["extraSubservices" "services"])
) )
) )
; ;