From 94c2661503ca65d149570900e326079c97153808 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 6 Jun 2014 14:03:10 +0200
Subject: tomcat: fix service to be a daemon, and run tomcat in script rather
 than preStart

---
 nixos/modules/services/web-servers/tomcat.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index b5eee8f8be8f..1de3d40165e9 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -119,6 +119,8 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        daemonType = "daemon";
+
         preStart =
           ''
             # Create the base directory
@@ -327,9 +329,11 @@ in
                 done
                 ''
             else ""}
+          '';
 
+        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'
-          '';
+        '';
 
         postStop =
           ''
-- 
cgit 1.4.1