about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authordanbst <abcz2.uprola@gmail.com>2016-09-07 16:11:15 +0000
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-09-09 18:29:12 +0200
commitf1072611a4301d3cf614112f1bb2ce0c48660712 (patch)
tree52b58d450542bf5d06f2848403afb4e2baab25d7 /nixos/modules/services
parent0c2d943529fcbf240fab31b7f5df2e01759a5b7f (diff)
downloadnixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.tar
nixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.tar.gz
nixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.tar.bz2
nixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.tar.lz
nixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.tar.xz
nixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.tar.zst
nixlib-f1072611a4301d3cf614112f1bb2ce0c48660712.zip
tomcat service: call shutdown in preStop, because postStop is too late (systemd kills process)
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index c1166b697681..acaa66c0d39f 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -352,7 +352,7 @@ in
           ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
       '';
 
-      postStop = ''
+      preStop = ''
         echo "Stopping tomcat..."
         CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
       '';