summaryrefslogtreecommitdiffstats
path: root/base/deploy/scripts/operations
diff options
context:
space:
mode:
Diffstat (limited to 'base/deploy/scripts/operations')
-rw-r--r--base/deploy/scripts/operations21
1 files changed, 9 insertions, 12 deletions
diff --git a/base/deploy/scripts/operations b/base/deploy/scripts/operations
index 0a768fb..336f847 100644
--- a/base/deploy/scripts/operations
+++ b/base/deploy/scripts/operations
@@ -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}"
@@ -945,13 +949,6 @@ verify_symlinks()
pki_systemd_service="pki-${PKI_WEB_SERVER_TYPE}d@.service"
systemd_dir="/lib/systemd/system"
- grep "Red Hat Enterprise Linux" /etc/redhat-release
- if [ $? == 0 ]; then
- resteasy_java_dir="/usr/share/java/resteasy-base"
- else
- resteasy_java_dir="/usr/share/java/resteasy"
- fi
-
# Dogtag 10 Symbolic Link Variables
pki_common_jar_dir="${PKI_INSTANCE_PATH}/common/lib"
pki_registry_dir="/etc/sysconfig/pki/${PKI_WEB_SERVER_TYPE}/${PKI_INSTANCE_ID}"
@@ -1053,15 +1050,15 @@ verify_symlinks()
[httpclient.jar]=${java_dir}/httpcomponents/httpclient.jar
[httpcore.jar]=${java_dir}/httpcomponents/httpcore.jar
[javassist.jar]=${java_dir}/javassist.jar
- [jaxrs-api.jar]=${resteasy_java_dir}/jaxrs-api.jar
+ [jaxrs-api.jar]=${RESTEASY_LIB}/jaxrs-api.jar
[jettison.jar]=${java_dir}/jettison.jar
[jss4.jar]=${jni_dir}/jss4.jar
[ldapjdk.jar]=${java_dir}/ldapjdk.jar
[pki-tomcat.jar]=${java_dir}/pki/pki-tomcat.jar
- [resteasy-atom-provider.jar]=${resteasy_java_dir}/resteasy-atom-provider.jar
- [resteasy-jaxb-provider.jar]=${resteasy_java_dir}/resteasy-jaxb-provider.jar
- [resteasy-jaxrs.jar]=${resteasy_java_dir}/resteasy-jaxrs.jar
- [resteasy-jettison-provider.jar]=${resteasy_java_dir}/resteasy-jettison-provider.jar
+ [resteasy-atom-provider.jar]=${RESTEASY_LIB}/resteasy-atom-provider.jar
+ [resteasy-jaxb-provider.jar]=${RESTEASY_LIB}/resteasy-jaxb-provider.jar
+ [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar
+ [resteasy-jettison-provider.jar]=${RESTEASY_LIB}/resteasy-jettison-provider.jar
[scannotation.jar]=${java_dir}/scannotation.jar
[tomcatjss.jar]=${java_dir}/tomcat7jss.jar
[velocity.jar]=${java_dir}/velocity.jar