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

Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts

Browse Source 
svn path=/nixos/branches/upstart-0.6/; revision=18430
This commit is contained in:
Sander van der Burg 2009-11-18 14:50:48 +00:00
parent aa9d0a067e
commit 6d11d63ba3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/services/web-servers/tomcat.nix
View File

@ -304,13 +304,10 @@ in
done
''
else ""}
''; # */
exec =
''
${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 1000d'
${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'
'';
postStop =
''
echo "Stopping tomcat..."