diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-06 20:12:47 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-07 01:46:08 -0400 |
| commit | 7e20f33c006aba169e2fc86f7bb55197d84400a4 (patch) | |
| tree | a4939d4ac3395a06af9fe425e3e8d9cfb6d47420 /base/common | |
| parent | 1dfa32683c509adffa7cb4e971ab6e423bd23eb2 (diff) | |
| download | pki-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/common')
| -rw-r--r-- | base/common/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | base/common/etc/pki.conf | 2 | ||||
| -rw-r--r-- | base/common/share/etc/pki.conf | 3 | ||||
| -rwxr-xr-x | base/common/upgrade/10.0.1/01-AddJniJarDir | 2 |
4 files changed, 10 insertions, 4 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 |