diff options
Diffstat (limited to 'base/deploy')
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 25 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 22 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/slot_substitution.py | 8 |
3 files changed, 19 insertions, 36 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 72ccad16a..245df5a5f 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -50,11 +50,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_tomcat_common_lib_path']) util.directory.create(master['pki_tomcat_tmpdir_path']) util.directory.create(master['pki_tomcat_webapps_path']) - util.directory.create(master['pki_tomcat_webapps_root_path']) - util.directory.create(master['pki_tomcat_webapps_root_webinf_path']) - util.file.copy(master['pki_source_webapps_root_web_xml'], - master['pki_tomcat_webapps_root_webinf_web_xml'], - overwrite_flag=True) util.directory.create(master['pki_tomcat_webapps_common_path']) util.directory.copy( os.path.join( @@ -62,6 +57,15 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "common-ui"), master['pki_tomcat_webapps_common_path'], overwrite_flag=True) + util.directory.create(master['pki_tomcat_webapps_root_path']) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "shared", + "webapps", + "ROOT"), + master['pki_tomcat_webapps_root_path'], + overwrite_flag=True) util.directory.create(master['pki_tomcat_work_path']) util.directory.create(master['pki_tomcat_work_catalina_path']) util.directory.create(master['pki_tomcat_work_catalina_host_path']) @@ -168,11 +172,16 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "common-ui"), master['pki_tomcat_webapps_common_path'], overwrite_flag=True) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "shared", + "webapps", + "ROOT"), + master['pki_tomcat_webapps_root_path'], + overwrite_flag=True) util.directory.modify(master['pki_tomcat_webapps_root_path']) util.directory.modify(master['pki_tomcat_webapps_root_webinf_path']) - util.file.copy(master['pki_source_webapps_root_web_xml'], - master['pki_tomcat_webapps_root_webinf_web_xml'], - overwrite_flag=True) util.directory.modify(master['pki_tomcat_work_path']) util.directory.modify(master['pki_tomcat_work_catalina_path']) util.directory.modify(master['pki_tomcat_work_catalina_host_path']) diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 64852f433..dd70874fe 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -406,9 +406,9 @@ def compose_pki_master_dictionary(): "lib") config.pki_master_dict['pki_tomcat_systemd'] =\ config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD - config.pki_master_dict['pki_source_webapps_path'] =\ + config.pki_master_dict['pki_shared_webapps_path'] =\ os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, - config.pki_master_dict['pki_subsystem'].lower(), + "shared", "webapps") config.pki_master_dict['pki_source_catalina_properties'] =\ os.path.join(config.pki_master_dict['pki_source_shared_path'], @@ -425,15 +425,6 @@ def compose_pki_master_dictionary(): config.pki_master_dict['pki_source_tomcat_conf'] =\ os.path.join(config.pki_master_dict['pki_source_shared_path'], "tomcat.conf") - config.pki_master_dict['pki_source_index_jsp'] =\ - os.path.join(config.pki_master_dict['pki_source_webapps_path'], - "ROOT", - "index.jsp") - config.pki_master_dict['pki_source_webapps_root_web_xml'] =\ - os.path.join(config.pki_master_dict['pki_source_webapps_path'], - "ROOT", - "WEB-INF", - "web.xml") if config.pki_master_dict['pki_subsystem'] == "CA": config.pki_master_dict['pki_source_emails'] =\ os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, @@ -573,11 +564,6 @@ def compose_pki_master_dictionary(): os.path.join( config.pki_master_dict['pki_tomcat_webapps_root_path'], "WEB-INF") - config.pki_master_dict['pki_tomcat_webapps_root_webinf_web_xml'] =\ - os.path.join( - config.pki_master_dict\ - ['pki_tomcat_webapps_root_webinf_path'], - "web.xml") config.pki_master_dict['pki_tomcat_work_path'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], "work") @@ -1012,10 +998,6 @@ def compose_pki_master_dictionary(): os.path.join( config.pki_master_dict['pki_instance_configuration_path'], "tomcat.conf") - config.pki_master_dict['pki_target_index_jsp'] =\ - os.path.join( - config.pki_master_dict['pki_tomcat_webapps_root_path'], - "index.jsp") # in-place slot substitution name/value pairs config.pki_master_dict['pki_target_auth_properties'] =\ os.path.join( diff --git a/base/deploy/src/scriptlets/slot_substitution.py b/base/deploy/src/scriptlets/slot_substitution.py index 482d1d9cb..39887611a 100644 --- a/base/deploy/src/scriptlets/slot_substitution.py +++ b/base/deploy/src/scriptlets/slot_substitution.py @@ -65,10 +65,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_source_tomcat_conf'], master['pki_target_tomcat_conf'], overwrite_flag=True) - util.file.copy_with_slot_substitution( - master['pki_source_index_jsp'], - master['pki_target_index_jsp'], - overwrite_flag=True) util.file.apply_slot_substitution( master['pki_target_auth_properties']) util.file.apply_slot_substitution( @@ -126,10 +122,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_source_tomcat_conf'], master['pki_target_tomcat_conf'], overwrite_flag=True) - util.file.copy_with_slot_substitution( - master['pki_source_index_jsp'], - master['pki_target_index_jsp'], - overwrite_flag=True) util.file.apply_slot_substitution( master['pki_target_auth_properties']) util.file.apply_slot_substitution( |