nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 14:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Quick hack to get the old Apache job working.

Browse Source 
svn path=/nixos/trunk/; revision=10785
This commit is contained in:
Eelco Dolstra 2008-02-20 17:03:48 +00:00
parent 50800ad3b5
commit ebea2dafa1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
upstart-jobs/httpd.nix
View File

@ -17,7 +17,6 @@ let
logDir = cfg.logDir; logDir = cfg.logDir;
stateDir = cfg.stateDir; stateDir = cfg.stateDir;
enableSSL = false; enableSSL = false;
extraDirectories = cfg.extraDirectories + extraConfig;
applicationMappings = cfg.mod_jk.applicationMappings; applicationMappings = cfg.mod_jk.applicationMappings;
startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces"; startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
@ -30,8 +29,9 @@ let
inherit hostName httpPort httpsPort inherit hostName httpPort httpsPort
user group adminAddr logDir stateDir user group adminAddr logDir stateDir
extraDirectories applicationMappings; applicationMappings;
noUserDir = !cfg.enableUserDir; noUserDir = !cfg.enableUserDir;
extraDirectories = extraConfig + cfg.extraConfig;
subServices = subServices =
@ -72,11 +72,11 @@ let
) )
) )
) )
++ /* ++
(optional cfg.extraSubservices.enable (optional cfg.extraSubservices.enable
(map (service : service webServer pkgs) cfg.extraSubservices.services) (map (service : service webServer pkgs) cfg.extraSubservices.services)
); ) */;
}; };
in in