swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-28 16:10:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3425 from luke-clifton/lc-tomcat-jdk

Browse source 
Allows the JDK to be chosen in services.tomcat
This commit is contained in:
Sander van der Burg 2014-08-03 14:55:46 +02:00
parent 4c659bafa3 e27dcfff1b
commit 2e44bb9ead
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/web-servers/tomcat.nix
View file

@ -77,6 +77,11 @@ in
description = "Whether to enable logging per virtual host."; description = "Whether to enable logging per virtual host.";
}; };
jdk = mkOption {
default = pkgs.jdk;
description "Which JDK to use.";
}
axis2 = { axis2 = {
enable = mkOption { enable = mkOption {
@ -332,13 +337,13 @@ in
''; '';
script = '' script = ''
${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
''; '';
postStop = postStop =
'' ''
echo "Stopping tomcat..." echo "Stopping tomcat..."
CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
''; '';
}; };