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.

6 files changed, 14 insertions, 8 deletions

diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index efdec85c4..3798503c0 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -6,6 +6,11 @@ configure_file(
     ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf
 )
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/etc/pki.conf
+    ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf
+)
+
 install(
     FILES
         ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf
@@ -15,7 +20,7 @@ install(
 
 install(
     FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf
+        ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf
     DESTINATION
         ${SYSCONF_INSTALL_DIR}/pki/
 )
diff --git a/base/common/etc/pki.conf b/base/common/etc/pki.conf
new file mode 100644
index 000000000..3e5a5e154
--- /dev/null
+++ b/base/common/etc/pki.conf
@@ -0,0 +1,2 @@
+# RESTEasy library
+RESTEASY_LIB=${RESTEASY_LIB}
diff --git a/base/common/share/etc/pki.conf b/base/common/share/etc/pki.conf
index 8b16efd4b..f3523442a 100644
--- a/base/common/share/etc/pki.conf
+++ b/base/common/share/etc/pki.conf
@@ -1,5 +1,2 @@
-# RESTEasy library
-RESTEASY_LIB=${RESTEASY_LIB}
-
 # JNI jar file location
 JNI_JAR_DIR=${JNI_JAR_DIR}
diff --git a/base/common/upgrade/10.0.1/01-AddJniJarDir b/base/common/upgrade/10.0.1/01-AddJniJarDir
index ea92640b5..212ffbdeb 100755
--- a/base/common/upgrade/10.0.1/01-AddJniJarDir
+++ b/base/common/upgrade/10.0.1/01-AddJniJarDir
@@ -47,6 +47,8 @@ class AddJniJarDir(pki.upgrade.PKIUpgradeScriptlet):
         # find JNI_JAR_DIR
         if conf.index('JNI_JAR_DIR') >= 0:
             # already exists
+            conf.set('JNI_JAR_DIR', default_path)
+            conf.write()
             return
 
         # find RESTEASY_LIB
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
diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py
index f10706ac6..dfb265279 100644
--- a/base/server/src/engine/pkiparser.py
+++ b/base/server/src/engine/pkiparser.py
@@ -163,7 +163,7 @@ class PKIConfigParser:
 
         # JNI jar location
         jni_jar_dir = subprocess.check_output(\
-            'source /etc/pki/pki.conf && echo $JNI_JAR_DIR',
+            'source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR',
             shell=True).strip()
 
         if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: