summaryrefslogtreecommitdiffstats
path: root/base/deploy/scripts/operations
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/deploy/scripts/operations
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/deploy/scripts/operations')
-rw-r--r--base/deploy/scripts/operations5
1 files changed, 4 insertions, 1 deletions
diff --git a/base/deploy/scripts/operations b/base/deploy/scripts/operations
index 61e4e5de9..60b66efdc 100644
--- a/base/deploy/scripts/operations
+++ b/base/deploy/scripts/operations
@@ -1058,13 +1058,16 @@ verify_symlinks()
[resteasy-jaxrs.jar]=${resteasy_java_dir}/resteasy-jaxrs.jar
[resteasy-jettison-provider.jar]=${resteasy_java_dir}/resteasy-jettison-provider.jar
[scannotation.jar]=${java_dir}/scannotation.jar
- [symkey.jar]=${jni_dir}/symkey.jar
[tomcatjss.jar]=${java_dir}/tomcat7jss.jar
[velocity.jar]=${java_dir}/velocity.jar
[xerces-j2.jar]=${java_dir}/xerces-j2.jar
[xml-commons-apis.jar]=${java_dir}/xml-commons-apis.jar
[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
+ fi
+
# '${pki_systemd_dir}' symlinks
systemd_symlinks[${pki_systemd_link}]=${systemd_dir}/${pki_systemd_service}