mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-19 03:28:45 +03:00
Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts
svn path=/nixos/branches/upstart-0.6/; revision=18430
This commit is contained in:
parent
aa9d0a067e
commit
6d11d63ba3
@ -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..."
|
||||
|
Loading…
Reference in New Issue
Block a user