ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 10:07:42 +03:00
Code Issues Projects Releases Wiki Activity

Added forgotten documentRoot variable

Browse Source 
svn path=/nixos/trunk/; revision=11081
This commit is contained in:
Sander van der Burg 2008-03-12 12:21:12 +00:00
parent 1b89e8a55b
commit 5005c49e45
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
upstart-jobs/httpd.nix
View File

@ -8,6 +8,7 @@ let
optional = pkgs.lib.optional; optional = pkgs.lib.optional;
documentRoot = cfg.documentRoot;
hostName = cfg.hostName; hostName = cfg.hostName;
httpPort = cfg.httpPort; httpPort = cfg.httpPort;
httpsPort = cfg.httpsPort; httpsPort = cfg.httpsPort;
@ -27,7 +28,7 @@ let
php = if cfg.mod_php then pkgs.php else null; php = if cfg.mod_php then pkgs.php else null;
tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null; tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
inherit hostName httpPort httpsPort inherit documentRoot hostName httpPort httpsPort
user group adminAddr logDir stateDir user group adminAddr logDir stateDir
applicationMappings; applicationMappings;
noUserDir = !cfg.enableUserDir; noUserDir = !cfg.enableUserDir;