From 7e20f33c006aba169e2fc86f7bb55197d84400a4 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Mon, 6 May 2013 20:12:47 -0400 Subject: Fixed incorrect JNI_JAR_DIR. The JNI_JAR_DIR is supposed to be architecture-specific but the pki-base package is architecture-neutral. So, to ensure it has the correct value, the variable will be set at post installation. Also, to simplify the upgrade process, the variable has been moved from /etc/pki/pki.conf into /usr/share/pki/etc/pki.conf. The build, deployment, startup, and upgrade scripts have been modified accordingly. --- base/server/scripts/operations | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'base/server/scripts') diff --git a/base/server/scripts/operations b/base/server/scripts/operations index 50dd4e4fd..616c28dd6 100644 --- a/base/server/scripts/operations +++ b/base/server/scripts/operations @@ -1088,7 +1088,7 @@ verify_symlinks() declare -A systemd_symlinks # Dogtag 10 Conditional Variables - jni_dir=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR` + jni_jar_dir=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` # Dogtag 10 Symbolic Link Target Variables java_dir="/usr/share/java" @@ -1198,7 +1198,7 @@ verify_symlinks() [javassist.jar]=${java_dir}/javassist.jar [jaxrs-api.jar]=${RESTEASY_LIB}/jaxrs-api.jar [jettison.jar]=${java_dir}/jettison.jar - [jss4.jar]=${jni_dir}/jss4.jar + [jss4.jar]=${jni_jar_dir}/jss4.jar [ldapjdk.jar]=${java_dir}/ldapjdk.jar [pki-tomcat.jar]=${java_dir}/pki/pki-tomcat.jar [resteasy-atom-provider.jar]=${RESTEASY_LIB}/resteasy-atom-provider.jar @@ -1213,7 +1213,7 @@ verify_symlinks() [xml-commons-resolver.jar]=${java_dir}/xml-commons-resolver.jar) if [ -e ${PKI_INSTANCE_PATH}/tks ]; then - common_jar_symlinks[symkey.jar]=${jni_dir}/symkey.jar + common_jar_symlinks[symkey.jar]=${jni_jar_dir}/symkey.jar fi # '${pki_systemd_dir}' symlinks -- cgit