From c7e5383e5383c7fbeacd4c4e3142b6bf2db83e45 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Tue, 6 Nov 2012 18:03:14 -0500 Subject: Deploy images from common-ui. Ticket #328 --- base/deploy/src/scriptlets/instance_layout.py | 8 ++++---- base/setup/pkicreate | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index b4d1a5068..f2673df29 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -100,13 +100,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "css"), overwrite_flag=True) - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to /webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", - "img"), + "images"), common_images, overwrite_flag=True) @@ -287,13 +287,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "css"), overwrite_flag=True) - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to /webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", - "img"), + "images"), common_images, overwrite_flag=True) diff --git a/base/setup/pkicreate b/base/setup/pkicreate index b5a904775..5cb5e9478 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2081,10 +2081,10 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to /docroot/pki/images return 0 if !copy_directory( - "$common_ui_subsystem_path/img", + "$common_ui_subsystem_path/images", "$docroot_instance_path/pki/images", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); -- cgit