diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-04-27 06:14:06 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-05-03 22:43:05 +0200 |
| commit | cf42fbf54a2611a3d15b14fca9476342f435cc3b (patch) | |
| tree | 8ff613a16ff21128f2a623a5167ae5bc700f8d61 | |
| parent | 85dc134529935334d8351629eeee67d6dec70abf (diff) | |
| download | pki-cf42fbf54a2611a3d15b14fca9476342f435cc3b.tar.gz pki-cf42fbf54a2611a3d15b14fca9476342f435cc3b.tar.xz pki-cf42fbf54a2611a3d15b14fca9476342f435cc3b.zip | |
Moved code to create systemd link for Tomcat.
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/configuration.py | 7 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/instance_layout.py | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py index ff8067fd9..a0734b150 100644 --- a/base/server/python/pki/server/deployment/scriptlets/configuration.py +++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py @@ -38,12 +38,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self, deployer): - # ALWAYS establish the following Tomcat instance symbolic link since - # this link is required by both automatic pkispawn instance - # configuration as well as manual browser GUI instance configuration - deployer.symlink.create(deployer.mdict['pki_systemd_service'], - deployer.mdict['pki_systemd_service_link']) - if config.str2bool(deployer.mdict['pki_skip_configuration']): config.pki_log.info(log.SKIP_CONFIGURATION_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) @@ -261,4 +255,3 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): if len(deployer.instance.tomcat_instance_subsystems()) == 1: if deployer.directory.exists(deployer.mdict['pki_client_dir']): deployer.directory.delete(deployer.mdict['pki_client_dir']) - deployer.symlink.delete(deployer.mdict['pki_systemd_service_link']) diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index 2af86bfeb..80f53f61b 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -293,12 +293,20 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_symkey_jar'], deployer.mdict['pki_symkey_jar_link']) + # ALWAYS establish the following Tomcat instance symbolic link since + # this link is required by both automatic pkispawn instance + # configuration as well as manual browser GUI instance configuration + deployer.symlink.create(deployer.mdict['pki_systemd_service'], + deployer.mdict['pki_systemd_service_link']) + def destroy(self, deployer): config.pki_log.info(log.INSTANCE_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) + # if there is no subsystem left in the instance if len(deployer.instance.tomcat_instance_subsystems()) == 0: + # remove Tomcat instance base deployer.directory.delete(deployer.mdict['pki_instance_path']) # remove Tomcat instance logs @@ -319,6 +327,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.directory.delete( deployer.mdict['pki_instance_type_registry_path']) + # remove Tomcat's systemd service link + deployer.symlink.delete(deployer.mdict['pki_systemd_service_link']) + # Callback only when the /usr/share/pki/server/conf directory # Is getting copied to the etc tree. |