diff options
author | Luca Bruno <lethalman88@gmail.com> | 2014-06-06 14:03:10 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2014-06-06 14:04:35 +0200 |
commit | 94c2661503ca65d149570900e326079c97153808 (patch) | |
tree | f7f422bd19848212ef213b89d6483ad206ba3547 | |
parent | 77a937beec87c704014e54b0f0164c2593236f7c (diff) | |
download | nixlib-94c2661503ca65d149570900e326079c97153808.tar nixlib-94c2661503ca65d149570900e326079c97153808.tar.gz nixlib-94c2661503ca65d149570900e326079c97153808.tar.bz2 nixlib-94c2661503ca65d149570900e326079c97153808.tar.lz nixlib-94c2661503ca65d149570900e326079c97153808.tar.xz nixlib-94c2661503ca65d149570900e326079c97153808.tar.zst nixlib-94c2661503ca65d149570900e326079c97153808.zip |
tomcat: fix service to be a daemon, and run tomcat in script rather than preStart
-rw-r--r-- | nixos/modules/services/web-servers/tomcat.nix | 6 |
1 files changed, 5 insertions, 1 deletions
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 = '' |