diff options
| author | Ade Lee <alee@redhat.com> | 2015-04-29 10:57:09 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2015-04-29 17:28:19 -0400 |
| commit | 161c5b2f048b577404b8a28f662fda6f72ba5c12 (patch) | |
| tree | c80b6800154cd726004e7944ac8e501cb35c8041 /base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | |
| parent | 267635f87c5ba9382f0931ad3e1b7cb9e42c6a6d (diff) | |
| download | pki-161c5b2f048b577404b8a28f662fda6f72ba5c12.tar.gz pki-161c5b2f048b577404b8a28f662fda6f72ba5c12.tar.xz pki-161c5b2f048b577404b8a28f662fda6f72ba5c12.zip | |
Code cleanup - simplify pkispawn code
All subsystems are now tomcat instances. Conditionals based on
whether the subsystem is a tomcat instance or not are no longer required.
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/slot_substitution.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py index 3baef04b9..2f2b13567 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -70,28 +70,17 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_target_tomcat_conf'], overwrite_flag=True) - # Strip "<filter>" section from subsystem "web.xml" - # This is ONLY necessary because XML comments cannot be "nested"! - # deployer.file.copy(deployer.mdict['pki_target_subsystem_web_xml'], - # deployer.mdict['pki_target_subsystem_web_xml_orig']) - # deployer.file.delete( - # deployer.mdict['pki_target_subsystem_web_xml']) - # util.xml_file.remove_filter_section_from_web_xml( - # deployer.mdict['pki_target_subsystem_web_xml_orig'], - # deployer.mdict['pki_target_subsystem_web_xml']) - # deployer.file.delete( - # deployer.mdict['pki_target_subsystem_web_xml_orig']) - if deployer.mdict['pki_subsystem'] == "CA": - deployer.file.copy_with_slot_substitution( - deployer.mdict['pki_source_proxy_conf'], - deployer.mdict['pki_target_proxy_conf']) - elif deployer.mdict['pki_subsystem'] == "TPS": - deployer.file.copy_with_slot_substitution( - deployer.mdict['pki_source_registry_cfg'], - deployer.mdict['pki_target_registry_cfg']) - deployer.file.copy_with_slot_substitution( - deployer.mdict['pki_source_phone_home_xml'], - deployer.mdict['pki_target_phone_home_xml']) + if deployer.mdict['pki_subsystem'] == "CA": + deployer.file.copy_with_slot_substitution( + deployer.mdict['pki_source_proxy_conf'], + deployer.mdict['pki_target_proxy_conf']) + elif deployer.mdict['pki_subsystem'] == "TPS": + deployer.file.copy_with_slot_substitution( + deployer.mdict['pki_source_registry_cfg'], + deployer.mdict['pki_target_registry_cfg']) + deployer.file.copy_with_slot_substitution( + deployer.mdict['pki_source_phone_home_xml'], + deployer.mdict['pki_target_phone_home_xml']) return self.rv def destroy(self, deployer): |