diff options
Diffstat (limited to 'base/deploy/src')
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 10 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkihelper.py | 6 |
2 files changed, 10 insertions, 6 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: 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 |