diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-17 13:04:45 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-18 13:11:16 -0500 |
commit | 8ed86a749548ed2c373026ec34f5284a329bb7c2 (patch) | |
tree | 419f3d7f907f2a9c7f76a838d260a6d9c94668f5 /base/deploy/src/scriptlets/instance_layout.py | |
parent | 69c06845a7a39c016ab29b0f2758e989b424698b (diff) | |
download | pki-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/src/scriptlets/instance_layout.py')
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 10 |
1 files changed, 7 insertions, 3 deletions
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: |