summaryrefslogtreecommitdiffstats
path: root/base/setup/scripts
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-09-17 13:04:45 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-09-18 13:11:16 -0500
commit8ed86a749548ed2c373026ec34f5284a329bb7c2 (patch)
tree419f3d7f907f2a9c7f76a838d260a6d9c94668f5 /base/setup/scripts
parent69c06845a7a39c016ab29b0f2758e989b424698b (diff)
downloadpki-8ed86a749548ed2c373026ec34f5284a329bb7c2.tar.gz
pki-8ed86a749548ed2c373026ec34f5284a329bb7c2.tar.xz
pki-8ed86a749548ed2c373026ec34f5284a329bb7c2.zip
Fixed problems with optional pki-symkey.
The deployment and init scripts have been fixed to create and check the link to symkey.jar if a TKS instance is added, and remove the link if the instance is removed. Ticket #331
Diffstat (limited to 'base/setup/scripts')
-rw-r--r--base/setup/scripts/functions5
1 files changed, 4 insertions, 1 deletions
diff --git a/base/setup/scripts/functions b/base/setup/scripts/functions
index 71685fe6d..2242063b2 100644
--- a/base/setup/scripts/functions
+++ b/base/setup/scripts/functions
@@ -971,12 +971,15 @@ verify_symlinks()
[pki-cmscore.jar]=/usr/share/java/pki/pki-cmscore.jar
[pki-cmsutil.jar]=/usr/share/java/pki/pki-cmsutil.jar
[pki-nsutil.jar]=/usr/share/java/pki/pki-nsutil.jar
- [symkey.jar]=${jni_dir}/symkey.jar
[velocity.jar]=/usr/share/java/velocity.jar
[xerces-j2.jar]=/usr/share/java/xerces-j2.jar
[xml-commons-apis.jar]=/usr/share/java/xml-commons-apis.jar
[xml-commons-resolver.jar]=/usr/share/java/xml-commons-resolver.jar)
+ if [ "${PKI_SUBSYSTEM_TYPE}" == "tks" ]; then
+ webapps_jar_symlinks[symkey.jar]=${jni_dir}/symkey.jar
+ fi
+
# '${pki_systemd_dir}' symlinks
systemd_symlinks[${pki_systemd_link}]=${systemd_dir}/${pki_systemd_service}