diff options
| author | Luke Clifton <ltclifton@gmail.com> | 2014-08-01 16:52:19 +0800 |
|---|---|---|
| committer | Luke Clifton <ltclifton@gmail.com> | 2014-08-01 16:52:19 +0800 |
| commit | e27dcfff1b108227bc96ad7678bdf1861a7adf71 (patch) | |
| tree | 20af3e3940763ee8137b4214d68d8be8d5117d4a /nixos/modules/services/web-servers/tomcat.nix | |
| parent | bb4d15a115a736e785d35d328c4fb9bfb7ed6d6d (diff) | |
| download | nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.tar nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.tar.gz nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.tar.bz2 nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.tar.lz nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.tar.xz nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.tar.zst nixlib-e27dcfff1b108227bc96ad7678bdf1861a7adf71.zip | |
Allows the JDK to be chosen in services.tomcat
Diffstat (limited to 'nixos/modules/services/web-servers/tomcat.nix')
| -rw-r--r-- | nixos/modules/services/web-servers/tomcat.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 1de3d40165e9..16958f24030a 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -77,6 +77,11 @@ in description = "Whether to enable logging per virtual host."; }; + jdk = mkOption { + default = pkgs.jdk; + description "Which JDK to use."; + } + axis2 = { enable = mkOption { @@ -332,13 +337,13 @@ in ''; 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' + ${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 = '' echo "Stopping tomcat..." - CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh + CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh ''; }; |