diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2015-04-22 04:07:03 -0400 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2015-04-22 18:07:59 -0600 |
| commit | 533b33a753801b3cc91529d83ac75f2214f86fcf (patch) | |
| tree | a16fc0f61fb82d6a28e1a21e877f8d47c96647dc /base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | |
| parent | 4ff163c0d9c549a2eee4588fb9b25d19c2a3d3e4 (diff) | |
| download | pki-533b33a753801b3cc91529d83ac75f2214f86fcf.tar.gz pki-533b33a753801b3cc91529d83ac75f2214f86fcf.tar.xz pki-533b33a753801b3cc91529d83ac75f2214f86fcf.zip | |
Added direct deployment for all subsystems.
The deployment tool has been modified to deploy all subsystems
directly from the /usr/share/pki. This will simplify updating
the templates in the web applications.
https://fedorahosted.org/pki/ticket/499
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 | 11 |
1 files changed, 0 insertions, 11 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 f86ae4900..3baef04b9 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -70,15 +70,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_target_tomcat_conf'], overwrite_flag=True) - # Configure web.xml and velocity.properties for each subsystem. - # For TPS this is not necessary since the files are no longer - # copied to the target location in the instance directory. - if deployer.mdict['pki_subsystem'] != "TPS": - deployer.file.apply_slot_substitution( - deployer.mdict['pki_target_velocity_properties']) - deployer.file.apply_slot_substitution( - deployer.mdict['pki_target_subsystem_web_xml']) - # 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'], @@ -94,8 +85,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.file.copy_with_slot_substitution( deployer.mdict['pki_source_proxy_conf'], deployer.mdict['pki_target_proxy_conf']) - deployer.file.apply_slot_substitution( - deployer.mdict['pki_target_profileselect_template']) elif deployer.mdict['pki_subsystem'] == "TPS": deployer.file.copy_with_slot_substitution( deployer.mdict['pki_source_registry_cfg'], |