summaryrefslogtreecommitdiffstats
path: root/base/deploy/etc
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2013-03-08 20:13:55 -0800
committerMatthew Harmsen <mharmsen@redhat.com>2013-03-08 21:48:23 -0800
commitb953c172bf274352c628ffef7d3ef0ef4c9ce59d (patch)
treeef2fe0e99cd26fba0171e2c2c2ae212a1a09dbb2 /base/deploy/etc
parentc87a65024177ed67cd4ec0f7d533d973f8e1f971 (diff)
downloadpki-b953c172bf274352c628ffef7d3ef0ef4c9ce59d.tar.gz
pki-b953c172bf274352c628ffef7d3ef0ef4c9ce59d.tar.xz
pki-b953c172bf274352c628ffef7d3ef0ef4c9ce59d.zip
Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to jss4.jar
Diffstat (limited to 'base/deploy/etc')
-rw-r--r--base/deploy/etc/default.cfg4
-rw-r--r--base/deploy/etc/pki.conf2
2 files changed, 4 insertions, 2 deletions
diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg
index faed34044..32e744762 100644
--- a/base/deploy/etc/default.cfg
+++ b/base/deploy/etc/default.cfg
@@ -272,8 +272,8 @@ pki_nsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-nsutil.
# JAR paths
# These are used in the processing of pkispawn and are not supposed
# to be overwritten by user configuration files
-pki_jss_jar=%(arch_java_lib)s/jss4.jar
-pki_symkey_jar=%(arch_java_lib)s/symkey.jar
+pki_jss_jar=%(jni_jar_dir)s/jss4.jar
+pki_symkey_jar=%(jni_jar_dir)s/symkey.jar
pki_apache_commons_collections_jar=/usr/share/java/apache-commons-collections.jar
pki_apache_commons_lang_jar=/usr/share/java/apache-commons-lang.jar
pki_apache_commons_logging_jar=/usr/share/java/apache-commons-logging.jar
diff --git a/base/deploy/etc/pki.conf b/base/deploy/etc/pki.conf
index 3e5a5e154..24decec52 100644
--- a/base/deploy/etc/pki.conf
+++ b/base/deploy/etc/pki.conf
@@ -1,2 +1,4 @@
# RESTEasy library
RESTEASY_LIB=${RESTEASY_LIB}
+# JNI jar file location
+JNI_JAR_DIR=${JNI_JAR_DIR}