From 79a3d828d4851afb66e3c18b812ae31171c39a6e Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Wed, 3 Oct 2012 19:09:08 -0500 Subject: Renamed "shared" folder to "server". The "shared" folder in /usr/share/pki has been renamed to "server" since it contains only server files. Ticket #353 --- base/deploy/src/scriptlets/pkiparser.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 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 a349436ff..cb419031f 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -358,9 +358,9 @@ def compose_pki_master_dictionary(): config.pki_master_dict['pki_source_setup_path'] =\ os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, "setup") - config.pki_master_dict['pki_source_shared_path'] =\ + config.pki_master_dict['pki_source_server_path'] =\ os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, - "shared", + "server", "conf") config.pki_master_dict['pki_source_cs_cfg'] =\ os.path.join(config.pki_master_dict['pki_source_conf_path'], @@ -406,24 +406,20 @@ def compose_pki_master_dictionary(): "lib") config.pki_master_dict['pki_tomcat_systemd'] =\ config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD - config.pki_master_dict['pki_shared_webapps_path'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, - "shared", - "webapps") config.pki_master_dict['pki_source_catalina_properties'] =\ - os.path.join(config.pki_master_dict['pki_source_shared_path'], + os.path.join(config.pki_master_dict['pki_source_server_path'], "catalina.properties") config.pki_master_dict['pki_source_servercertnick_conf'] =\ - os.path.join(config.pki_master_dict['pki_source_shared_path'], + os.path.join(config.pki_master_dict['pki_source_server_path'], "serverCertNick.conf") config.pki_master_dict['pki_source_server_xml'] =\ - os.path.join(config.pki_master_dict['pki_source_shared_path'], + os.path.join(config.pki_master_dict['pki_source_server_path'], "server.xml") config.pki_master_dict['pki_source_context_xml'] =\ - os.path.join(config.pki_master_dict['pki_source_shared_path'], + os.path.join(config.pki_master_dict['pki_source_server_path'], "context.xml") config.pki_master_dict['pki_source_tomcat_conf'] =\ - os.path.join(config.pki_master_dict['pki_source_shared_path'], + os.path.join(config.pki_master_dict['pki_source_server_path'], "tomcat.conf") if config.pki_master_dict['pki_subsystem'] == "CA": config.pki_master_dict['pki_source_emails'] =\ -- cgit