summaryrefslogtreecommitdiffstats
path: root/base/deploy
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
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')
-rw-r--r--base/deploy/scripts/operations5
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py10
-rw-r--r--base/deploy/src/scriptlets/pkihelper.py6
3 files changed, 14 insertions, 7 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}
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index 245df5a5f..c5f884ec3 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -125,8 +125,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
master['pki_resteasy_jettison_provider_jar_link'])
util.symlink.create(master['pki_scannotation_jar'],
master['pki_scannotation_jar_link'])
- util.symlink.create(master['pki_symkey_jar'],
- master['pki_symkey_jar_link'])
+ if master['pki_subsystem'] == 'TKS':
+ util.symlink.create(master['pki_symkey_jar'],
+ master['pki_symkey_jar_link'])
util.symlink.create(master['pki_tomcatjss_jar'],
master['pki_tomcatjss_jar_link'])
util.symlink.create(master['pki_velocity_jar'],
@@ -225,7 +226,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
util.symlink.modify(
master['pki_resteasy_jettison_provider_jar_link'])
util.symlink.modify(master['pki_scannotation_jar_link'])
- util.symlink.modify(master['pki_symkey_jar_link'])
+ if master['pki_subsystem'] == 'TKS':
+ util.symlink.modify(master['pki_symkey_jar_link'])
util.symlink.modify(master['pki_tomcatjss_jar_link'])
util.symlink.modify(master['pki_velocity_jar_link'])
util.symlink.modify(master['pki_xerces_j2_jar_link'])
@@ -245,6 +247,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
def destroy(self):
config.pki_log.info(log.INSTANCE_DESTROY_1, __name__,
extra=config.PKI_INDENTATION_LEVEL_1)
+ if master['pki_subsystem'] == 'TKS':
+ util.symlink.delete(master['pki_symkey_jar_link'])
if not config.pki_dry_run_flag:
if master['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and\
util.instance.apache_instance_subsystems() == 0:
diff --git a/base/deploy/src/scriptlets/pkihelper.py b/base/deploy/src/scriptlets/pkihelper.py
index adbbe7cb5..8145a02d8 100644
--- a/base/deploy/src/scriptlets/pkihelper.py
+++ b/base/deploy/src/scriptlets/pkihelper.py
@@ -1224,12 +1224,12 @@ class directory:
# systems since 'chmod' CANNOT be
# run directly against symbolic
# links!
- # chown -h <uid>:<gid> <link>
+ # chown -h <uid>:<gid> <symlink>
config.pki_log.debug(log.PKIHELPER_CHOWN_H_3,
- uid, gid, link,
+ uid, gid, symlink,
extra=config.PKI_INDENTATION_LEVEL_3)
if not config.pki_dry_run_flag:
- os.lchown(link, uid, gid)
+ os.lchown(symlink, uid, gid)
# Store record in installation manifest
record = manifest.record()
record.name = name