Merge webapp_deployment.py into subsystem_layout.py

dogtagpki · Jul 19, 2023 · 3659baf · 3659baf
1 parent d9a29df
commit 3659baf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 61 deletions.
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg
@@ -40,7 +40,6 @@ spawn_scriplets=
     infrastructure_layout
     instance_layout
     subsystem_layout
-    webapp_deployment
     security_databases
     selinux_setup
     keygen
@@ -53,7 +52,6 @@ destroy_scriplets=
     initialization
     configuration
     keygen
-    webapp_deployment
     subsystem_layout
     security_databases
     instance_layout

diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
@@ -441,11 +441,16 @@ def spawn(self, deployer):
 
     def destroy(self, deployer):
 
-        logger.info('Removing %s subsystem', deployer.mdict['pki_subsystem'])
-
         instance = self.instance
+        subsystem_name = deployer.mdict['pki_subsystem'].lower()
+
+        logger.info('Undeploying /%s web application', subsystem_name)
+
+        subsystem = instance.get_subsystem(subsystem_name)
+        subsystem.disable(force=deployer.force)
+
+        logger.info('Removing %s subsystem', deployer.mdict['pki_subsystem'])
 
-        subsystem = instance.get_subsystem(deployer.mdict['pki_subsystem'].lower())
         instance.remove_subsystem(subsystem)
 
         if config.str2bool(deployer.mdict['pki_registry_enable']):

diff --git a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py
@@ -615,10 +615,11 @@ def enable(self, wait=False, max_wait=60, timeout=None):
             max_wait=max_wait,
             timeout=timeout)
 
-    def disable(self, wait=False, max_wait=60, timeout=None):
+    def disable(self, force=False, wait=False, max_wait=60, timeout=None):
 
         self.instance.undeploy_webapp(
             self.name,
+            force=force,
             wait=wait,
             max_wait=max_wait,
             timeout=timeout)