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/instance_layout.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'base/deploy/src/scriptlets/instance_layout.py') diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 5b48b87b5..2f79de83c 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -46,7 +46,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # establish Apache/Tomcat specific instance if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: # establish Tomcat instance configuration - util.directory.copy(master['pki_source_shared_path'], + util.directory.copy(master['pki_source_server_path'], master['pki_instance_configuration_path'], overwrite_flag=True) # establish Tomcat instance base @@ -77,7 +77,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "shared", + "server", "webapps", "ROOT"), master['pki_tomcat_webapps_root_path'], @@ -185,7 +185,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "shared", + "server", "webapps", "ROOT"), master['pki_tomcat_webapps_root_path'], @@ -244,7 +244,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # update instance convenience symbolic links util.symlink.modify(master['pki_instance_database_link']) util.symlink.modify(master['pki_instance_conf_link']) - util.directory.copy(master['pki_source_shared_path'], + util.directory.copy(master['pki_source_server_path'], master['pki_instance_configuration_path'], overwrite_flag=True) util.symlink.modify(master['pki_instance_logs_link']) -- cgit