summaryrefslogtreecommitdiffstats
path: root/base/common/shared/conf/tomcat.conf
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-06 13:06:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-12-06 19:31:38 -0500
commit7259a1256afc853b91aa09cd48592a706591fa08 (patch)
tree50d156b9c2d537ddd32bc04fe3b4c72329c37925 /base/common/shared/conf/tomcat.conf
parentcd279e34b5d92ff8fe53e79c974baf9972221748 (diff)
downloadpki-ticket-422-1.tar.gz
pki-ticket-422-1.tar.xz
pki-ticket-422-1.zip
Parameterizing RESTEasy paths.ticket-422-1
The paths to RESTEasy jar files have been modified such that it can be configured globally at build time using the spec file to support different distributions, and at deployment time using a system-wide configuration in /etc/pki/pki.conf. Ticket #422, #423.
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]"