summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
diff options
context:
space:
mode:
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/instance_layout.py')
-rw-r--r--base/server/python/pki/server/deployment/scriptlets/instance_layout.py11
1 files changed, 11 insertions, 0 deletions
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.