summaryrefslogtreecommitdiffstats
path: root/base/common/shared/conf/tomcat.conf
diff options
context:
space:
mode:
Diffstat (limited to 'base/common/shared/conf/tomcat.conf')
-rw-r--r--base/common/shared/conf/tomcat.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/base/common/shared/conf/tomcat.conf b/base/common/shared/conf/tomcat.conf
index 54d67e4b4..7b8f87cb5 100644
--- a/base/common/shared/conf/tomcat.conf
+++ b/base/common/shared/conf/tomcat.conf
@@ -14,6 +14,10 @@
# (see, for instance, /etc/sysconfig/tomcat)
#
+if [ -f /etc/pki/pki.conf ] ; then
+ . /etc/pki/pki.conf
+fi
+
# Where your java installation lives
#JAVA_HOME="/usr/lib/jvm/jre"
@@ -32,6 +36,9 @@ CATALINA_TMPDIR=[PKI_TMPDIR]
# Enable the following JAVA_OPTS to run a java debugger (e. g. - 'eclipse')
#JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Djava.awt.headless=true -Xmx128M"
+# RESTEasy
+JAVA_OPTS="$JAVA_OPTS -DRESTEASY_LIB=${RESTEASY_LIB}"
+
# What user should run tomcat
TOMCAT_USER="[PKI_USER]"