diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-06-16 17:23:22 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-06-17 20:19:09 +0200 |
| commit | fc96c05922d1a42d0fbaaa02a67a31e69c667f84 (patch) | |
| tree | b0a1fd07d733888cbda0480439859e1af752ff17 /base/server/share | |
| parent | 502e9ee5eb52bda8cb5bdf4ac4ef1d32dbded98f (diff) | |
| download | pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.tar.gz pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.tar.xz pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.zip | |
Fixed Java dependency.
The code has been modified to use the JAVA_HOME path specified in
the pki.conf.
The spec file has been modified to depend specifically on OpenJDK
1.8.0 and to provide the default JAVA_HOME path for the pki.conf.
https://fedorahosted.org/pki/ticket/2363
Diffstat (limited to 'base/server/share')
| -rw-r--r-- | base/server/share/conf/tomcat.conf | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/base/server/share/conf/tomcat.conf b/base/server/share/conf/tomcat.conf index 83a6cf1e6..bd2359c8b 100644 --- a/base/server/share/conf/tomcat.conf +++ b/base/server/share/conf/tomcat.conf @@ -4,23 +4,15 @@ # Modifications: configuration parameters # --- END COPYRIGHT BLOCK --- -# System-wide configuration file for tomcat services -# This will be sourced by tomcat and any secondary service -# Values will be overridden by service-specific configuration -# files in /etc/sysconfig -# -# Use this one to change default values for all services -# Change the service specific ones to affect only one service -# (see, for instance, /etc/sysconfig/tomcat) -# +# This file contains instance-specific configuration. # Where your java installation lives -#JAVA_HOME="/usr/lib/jvm/jre" +JAVA_HOME="[JAVA_HOME]" # Where your tomcat installation lives CATALINA_BASE="[PKI_INSTANCE_PATH]" -#CATALINA_HOME="/usr/share/tomcat" -#JASPER_HOME="/usr/share/tomcat" + +# Instance tmp dir CATALINA_TMPDIR=[PKI_TMPDIR] # NOTE: JAVA_OPTS is now only read once. All desired settings must be concatenated |