From 6d11d63ba313cf2ca839df20edd98d816cecd527 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Nov 2009 14:50:48 +0000
Subject: [PATCH] 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
---
 modules/services/web-servers/tomcat.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 4eb5b3fc5b5..1a2c17dcf1b 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -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..."