diff options
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py | 96 |
1 files changed, 29 insertions, 67 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py index ccbf4ea90..70f2ccc88 100644 --- a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py +++ b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py @@ -40,76 +40,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): __name__, extra=config.PKI_INDENTATION_LEVEL_1) return self.rv + config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - # Copy /usr/share/pki/server/webapps/ROOT - # to <instance>/webapps/ROOT - deployer.directory.create(deployer.master_dict['pki_tomcat_webapps_root_path']) - deployer.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "ROOT"), - deployer.master_dict['pki_tomcat_webapps_root_path'], - overwrite_flag=True) - - deployer.directory.create(deployer.master_dict['pki_tomcat_webapps_common_path']) - - # If desired and available, - # copy selected server theme - # to <instance>/webapps/pki - if config.str2bool(deployer.master_dict['pki_theme_enable']) and\ - os.path.exists(deployer.master_dict['pki_theme_server_dir']): - deployer.directory.copy(deployer.master_dict['pki_theme_server_dir'], - deployer.master_dict['pki_tomcat_webapps_common_path'], - overwrite_flag=True) - - # Copy /usr/share/pki/server/webapps/pki/js - # to <instance>/webapps/pki/js - deployer.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "pki", - "js"), - os.path.join( - deployer.master_dict['pki_tomcat_webapps_common_path'], - "js"), - overwrite_flag=True) - - # Copy /usr/share/pki/server/webapps/pki/META-INF - # to <instance>/webapps/pki/META-INF - deployer.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "pki", - "META-INF"), - os.path.join( - deployer.master_dict['pki_tomcat_webapps_common_path'], - "META-INF"), - overwrite_flag=True) - - # Copy /usr/share/pki/server/webapps/pki/admin - # to <instance>/webapps/<subsystem>/admin - # TODO: common templates should be deployed in common webapp - deployer.directory.create(deployer.master_dict['pki_tomcat_webapps_subsystem_path']) - deployer.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "pki", - "admin"), - os.path.join( - deployer.master_dict['pki_tomcat_webapps_subsystem_path'], - "admin"), - overwrite_flag=True) - # Copy /usr/share/pki/<subsystem>/webapps/<subsystem> # to <instance>/webapps/<subsystem> deployer.directory.copy( @@ -155,11 +89,39 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.master_dict['pki_tps_jar_link']) # set ownerships, permissions, and acls deployer.directory.set_mode(deployer.master_dict['pki_tomcat_webapps_subsystem_path']) + + # Copy /usr/share/pki/<subsystem>/conf/Catalina/localhost/<subsystem>.xml + # to <instance>/conf/Catalina/localhost/<subsystem>.xml + deployer.file.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + deployer.master_dict['pki_subsystem'].lower(), + "conf", + "Catalina", + "localhost", + deployer.master_dict['pki_subsystem'].lower() + ".xml"), + os.path.join( + deployer.master_dict['pki_instance_configuration_path'], + "Catalina", + "localhost", + deployer.master_dict['pki_subsystem'].lower() + ".xml")) + return self.rv def destroy(self, deployer): if deployer.master_dict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: config.pki_log.info(log.WEBAPP_DEPLOYMENT_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) + + # Delete <instance>/conf/Catalina/localhost/<subsystem>.xml + deployer.file.delete( + os.path.join( + deployer.master_dict['pki_instance_configuration_path'], + "Catalina", + "localhost", + deployer.master_dict['pki_subsystem'].lower() + ".xml")) + + # Delete <instance>/webapps/<subsystem> deployer.directory.delete(deployer.master_dict['pki_tomcat_webapps_subsystem_path']) + return self.rv |