diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-01 21:06:21 -0400 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-02 12:58:19 -0400 |
commit | d35e4c5f75606e014b5fe9b61e3b66a43b1871f4 (patch) | |
tree | 74cf83ef04ba36c0f28ea3d97f6d0bf42434aaa8 | |
parent | 075e7fa246c60747080e10866700f8d20402a6b9 (diff) | |
download | pki-d35e4c5f75606e014b5fe9b61e3b66a43b1871f4.tar.gz pki-d35e4c5f75606e014b5fe9b61e3b66a43b1871f4.tar.xz pki-d35e4c5f75606e014b5fe9b61e3b66a43b1871f4.zip |
Merged theme images.
Currently the theme images are copied into each subsystem during
deployment creating duplicates. To reduce the problem the images
will be combined into a common folder /pki/images.
The process will be done over several patches. This patch will
copy the images into /pki/images folder. Subsequent patches will
update the all references the images. When it's done, the images
no longer need to be duplicated into each subsystem.
Ticket #328
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 122 | ||||
-rwxr-xr-x | base/setup/pkicreate | 16 |
2 files changed, 133 insertions, 5 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 219f049c8..c325f0aed 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -71,12 +71,69 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_tomcat_tmpdir_path']) util.directory.create(master['pki_tomcat_webapps_path']) util.directory.create(master['pki_tomcat_webapps_common_path']) + + # Copy /usr/share/pki/common-ui/img to <instance>/webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui"), - master['pki_tomcat_webapps_common_path'], + "common-ui", + "img"), + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), overwrite_flag=True) + + # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/admin/graphics + # to <instance>/webapp/pki/images + dir = os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower(), + "admin", + "graphics") + if (util.directory.exists(dir)): + util.directory.copy( + dir, + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), + overwrite_flag=True) + + # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/agent/graphics + # to <instance>/webapp/pki/images + dir = os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower(), + "agent", + "graphics") + if (util.directory.exists(dir)): + util.directory.copy( + dir, + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), + overwrite_flag=True) + + # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/ee/graphics + # to <instance>/webapp/pki/images + dir = os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower(), + "ee", + "graphics") + if (util.directory.exists(dir)): + util.directory.copy( + dir, + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), + overwrite_flag=True) + util.directory.create(master['pki_tomcat_webapps_root_path']) util.directory.copy( os.path.join( @@ -180,12 +237,69 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.modify(master['pki_instance_lib']) util.directory.modify(master['pki_instance_lib_log4j_properties']) util.directory.modify(master['pki_tomcat_webapps_path']) + + # Copy /usr/share/pki/common-ui/img to <instance>/webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui"), - master['pki_tomcat_webapps_common_path'], + "common-ui", + "img"), + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), overwrite_flag=True) + + # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/admin/graphics + # to <instance>/webapp/pki/images + dir = os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower(), + "admin", + "graphics") + if (util.directory.exists(dir)): + util.directory.copy( + dir, + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), + overwrite_flag=True) + + # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/agent/graphics + # to <instance>/webapp/pki/images + dir = os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower(), + "agent", + "graphics") + if (util.directory.exists(dir)): + util.directory.copy( + dir, + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), + overwrite_flag=True) + + # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/ee/graphics + # to <instance>/webapp/pki/images + dir = os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower(), + "ee", + "graphics") + if (util.directory.exists(dir)): + util.directory.copy( + dir, + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), + overwrite_flag=True) + util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 506e766ef..29f83b061 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2061,11 +2061,25 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - return 0 if !copy_directory($ui_subsystem_path, $pki_instance_path, $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); + # Copy /usr/share/pki/common-ui/img to <instance>/docroot/pki/images + return 0 if !copy_directory( + "$common_ui_subsystem_path/img", + "$docroot_instance_path/pki/images", + $default_dir_permissions, $default_file_permissions, + $pki_user, $pki_group); + + # Copy /usr/share/pki/<subsystem>-ui/docroot/<subsystem>/admin/console/img + # to <instance>/docroot/pki/images + return 0 if !copy_directory( + "$ui_subsystem_path/docroot/$subsystem_type/admin/console/img", + "$docroot_instance_path/pki/images", + $default_dir_permissions, $default_file_permissions, + $pki_user, $pki_group); + # fix permissions if (!is_Windows()) { # Apache Specific |