summaryrefslogtreecommitdiffstats
path: root/base/setup/scripts/functions
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/setup/scripts/functions
parentcd279e34b5d92ff8fe53e79c974baf9972221748 (diff)
downloadpki-7259a1256afc853b91aa09cd48592a706591fa08.tar.gz
pki-7259a1256afc853b91aa09cd48592a706591fa08.tar.xz
pki-7259a1256afc853b91aa09cd48592a706591fa08.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/setup/scripts/functions')
-rw-r--r--base/setup/scripts/functions6
1 files changed, 5 insertions, 1 deletions
diff --git a/base/setup/scripts/functions b/base/setup/scripts/functions
index 058022efc..3f7f9553d 100644
--- a/base/setup/scripts/functions
+++ b/base/setup/scripts/functions
@@ -30,6 +30,10 @@
# 200-254 reserved
#
+if [ -f /etc/pki/pki.conf ] ; then
+ . /etc/pki/pki.conf
+fi
+
# PKI subsystem-level directory and file values for locks
lockfile="/var/lock/subsys/${SERVICE_NAME}"
@@ -980,7 +984,7 @@ verify_symlinks()
[xml-commons-apis.jar]=/usr/share/java/xml-commons-apis.jar
[xml-commons-resolver.jar]=/usr/share/java/xml-commons-resolver.jar
# dogtag 9 -> dogtag 10
- [resteasy-jaxrs.jar]=/usr/share/java/resteasy/resteasy-jaxrs.jar)
+ [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar)
if [ "${PKI_SUBSYSTEM_TYPE}" == "tks" ]; then
webapps_jar_symlinks[symkey.jar]=${jni_dir}/symkey.jar