From 34d7a671cf9d884135bf50f89f5f420ce697d1b4 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 29 Apr 2015 11:11:41 -0400 Subject: 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. --- .../python/pki/server/deployment/scriptlets/slot_substitution.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'base/server/python') 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'], -- cgit