summaryrefslogtreecommitdiffstats
path: root/base/server/src
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-05-06 20:12:47 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2013-05-07 01:46:08 -0400
commit7e20f33c006aba169e2fc86f7bb55197d84400a4 (patch)
treea4939d4ac3395a06af9fe425e3e8d9cfb6d47420 /base/server/src
parent1dfa32683c509adffa7cb4e971ab6e423bd23eb2 (diff)
downloadpki-7e20f33c006aba169e2fc86f7bb55197d84400a4.tar.gz
pki-7e20f33c006aba169e2fc86f7bb55197d84400a4.tar.xz
pki-7e20f33c006aba169e2fc86f7bb55197d84400a4.zip
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.
Diffstat (limited to 'base/server/src')
-rw-r--r--base/server/src/engine/pkiparser.py2
1 files changed, 1 insertions, 1 deletions
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: