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

Added CATALINA_OPTS parameter

Browse Source 
svn path=/nixos/trunk/; revision=12588
This commit is contained in:
Sander van der Burg 2008-08-11 21:35:45 +00:00
parent 5dc694d39a
commit 4c3627f16e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
system/options.nix
View File

@ -1508,6 +1508,11 @@ in
description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat"; description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
}; };
catalinaOpts = mkOption {
default = "";
description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
};
sharedLibFrom = mkOption { sharedLibFrom = mkOption {
default = ""; default = "";
description = "Location where shared libraries are stored. Leave empty to use the baseDir."; description = "Location where shared libraries are stored. Leave empty to use the baseDir.";

2
upstart-jobs/tomcat.nix
View File

@ -99,7 +99,7 @@ in
end script end script
respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d' respawn ${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}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
stop script stop script
echo "Stopping tomcat..." echo "Stopping tomcat..."