diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-05 15:59:44 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-11 09:55:06 -0500 |
| commit | fb80a25498513a5f5242acfd185d2db2d3b6e8c1 (patch) | |
| tree | f9b950d578a15fcb6c3e27b2f4439bea6bd0c8ff /base/setup/pkicreate | |
| parent | 4109bc317073df1ffade06d7d01a542a422d7976 (diff) | |
| download | pki-fb80a25498513a5f5242acfd185d2db2d3b6e8c1.tar.gz pki-fb80a25498513a5f5242acfd185d2db2d3b6e8c1.tar.xz pki-fb80a25498513a5f5242acfd185d2db2d3b6e8c1.zip | |
Updated tools to deploy combined images and CSS files.
The pkispawn and pkicreate have been updated to deploy the
combined images and CSS files from the common-ui into /pki/images
and /pki/css.
The common Velocity templates and JavaScript files still need to
be deployed from the <subsystem>-ui packages into each subsystem.
Ticket #328
Diffstat (limited to 'base/setup/pkicreate')
| -rwxr-xr-x | base/setup/pkicreate | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 767960778..ac037f0a2 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2065,14 +2065,6 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/admin/console/img - # to <instance>/docroot/pki/images - return 0 if !copy_directory( - "$common_ui_subsystem_path/admin/console/img", - "$docroot_instance_path/pki/images", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/css # to <instance>/docroot/pki/css return 0 if !copy_directory( @@ -2081,18 +2073,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 <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", + "$common_ui_subsystem_path/images", "$docroot_instance_path/pki/images", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); @@ -2124,9 +2108,21 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - return 0 if !copy_directory($common_ui_subsystem_path, $webapps_subsystem_instance_path, - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); + # Copy /usr/share/pki/common-ui/admin/console/config + # to <instance>/webapp/<subsystem>/admin/console/config + return 0 if !copy_directory( + "$common_ui_subsystem_path/admin/console/config", + "$webapps_subsystem_instance_path/admin/console/config", + $default_dir_permissions, $default_file_permissions, + $pki_user, $pki_group); + + # Copy /usr/share/pki/common-ui/admin/console/js + # to <instance>/webapp/<subsystem>/admin/console/js + return 0 if !copy_directory( + "$common_ui_subsystem_path/admin/console/js", + "$webapps_subsystem_instance_path/admin/console/js", + $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, |