BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added mod_jk module to apache httpd

Browse source 
svn path=/nixos/trunk/; revision=10310
This commit is contained in:
Sander van der Burg 2008-01-28 15:40:29 +00:00
parent 8d5884e01f
commit 1727c4bd3b
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
system/options.nix
View file

@ -1147,6 +1147,16 @@
description = "Whether to enable the PHP module.";
};
mod_jk = {
enable = mkOption {
default = false;
description = "Whether to enable the Apache Tomcat connector.";
};
applicationMappings = mkOption {
default = [];
description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
};
subservices = {

6
upstart-jobs/httpd.nix
View file

@ -18,17 +18,19 @@ let
stateDir = cfg.stateDir;
enableSSL = false;
extraDirectories = cfg.extraDirectories + extraConfig;
applicationMappings = cfg.mod_jk.applicationMappings;
startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
webServer = import ../../services/apache-httpd {
inherit (pkgs) apacheHttpd coreutils;
stdenv = pkgs.stdenvNewSetupScript;
php = if cfg.mod_php then pkgs.php else null;
tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
inherit hostName httpPort httpsPort
user group adminAddr logDir stateDir
extraDirectories;
extraDirectories applicationMappings;
noUserDir = !cfg.enableUserDir;
subServices =