diff options
| author | Ade Lee <alee@redhat.com> | 2015-04-29 11:11:41 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2015-04-29 17:29:18 -0400 |
| commit | 34d7a671cf9d884135bf50f89f5f420ce697d1b4 (patch) | |
| tree | 0d7e093e8c45d5ff590e7f9c6e049a5fad31d014 /base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | |
| parent | 161c5b2f048b577404b8a28f662fda6f72ba5c12 (diff) | |
| download | pki-34d7a671cf9d884135bf50f89f5f420ce697d1b4.tar.gz pki-34d7a671cf9d884135bf50f89f5f420ce697d1b4.tar.xz pki-34d7a671cf9d884135bf50f89f5f420ce697d1b4.zip | |
Trac Ticket 1196 - serverCertNick.conf is replaced incorrectly
When second subsystem is installed, serverCertNick.conf and other top level
tomcat config files should not be replaced.
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 | 4 |
1 files changed, 3 insertions, 1 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 2f2b13567..cbcd7e342 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -44,7 +44,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_source_registry'], deployer.mdict['pki_target_registry'], overwrite_flag=True) - if deployer.mdict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: + + # these are instance level files. Only copy for the first instance. + if len(deployer.instance.tomcat_instance_subsystems()) == 1: deployer.file.copy_with_slot_substitution( deployer.mdict['pki_source_catalina_properties'], deployer.mdict['pki_target_catalina_properties'], |