From 7b737b2ea9d798cbbfb27ad15d157a7cb42fdb08 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Fri, 14 Sep 2012 15:42:01 -0500 Subject: Fixed conflicting log4j.properties. The /lib link has been replaced with a real folder which contains links to the files in /usr/share/tomcat/lib. This way the log4j.properties can be placed in this folder without causing conflicts with other instances. Ticket: #284 --- base/deploy/src/scriptlets/pkiparser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'base/deploy/src/scriptlets/pkiparser.py') diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index dd70874fe..a235c5917 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -587,7 +587,7 @@ def compose_pki_master_dictionary(): config.pki_master_dict['pki_subsystem'].lower()) # Tomcat instance log name/value pairs # Tomcat instance configuration name/value pairs - config.pki_master_dict['pki_instance_log4j_properties'] =\ + config.pki_master_dict['pki_instance_conf_log4j_properties'] =\ os.path.join( config.pki_master_dict['pki_instance_configuration_path'], "log4j.properties") @@ -604,11 +604,11 @@ def compose_pki_master_dictionary(): config.pki_master_dict['pki_tomcat_bin_link'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], "bin") - config.pki_master_dict['pki_tomcat_lib_link'] =\ + config.pki_master_dict['pki_instance_lib'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], "lib") - config.pki_master_dict['pki_tomcat_lib_log4j_properties_link'] =\ - os.path.join(config.pki_master_dict['pki_tomcat_lib_path'], + config.pki_master_dict['pki_instance_lib_log4j_properties'] =\ + os.path.join(config.pki_master_dict['pki_instance_lib'], "log4j.properties") config.pki_master_dict['pki_instance_systemd_link'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], -- cgit