diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-09 01:51:54 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-09 01:51:54 -0500 |
| commit | a6e6dc72a0a83dd718c0cf896b1f4f5d36271e28 (patch) | |
| tree | 42ed65eb7892eb1b2e883286cd683b6a54140f7c /base/setup/pkicreate | |
| parent | be9fd5c5ef02d9f5e6ab1335754f48a96e5a92f7 (diff) | |
| download | pki-a6e6dc72a0a83dd718c0cf896b1f4f5d36271e28.tar.gz pki-a6e6dc72a0a83dd718c0cf896b1f4f5d36271e28.tar.xz pki-a6e6dc72a0a83dd718c0cf896b1f4f5d36271e28.zip | |
Moved common templates to base/common.
Diffstat (limited to 'base/setup/pkicreate')
| -rwxr-xr-x | base/setup/pkicreate | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 6b503fe7e..6f63e96e8 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2065,27 +2065,11 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/css - # to <instance>/docroot/pki/css + # Copy /usr/share/pki/common-ui + # to <instance>/docroot/pki return 0 if !copy_directory( - "$common_ui_subsystem_path/css", - "$docroot_instance_path/pki/css", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - - # Copy /usr/share/pki/common-ui/esc - # to <instance>/docroot/pki/esc - return 0 if !copy_directory( - "$common_ui_subsystem_path/esc", - "$docroot_instance_path/pki/esc", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - - # Copy /usr/share/pki/common-ui/images - # to <instance>/docroot/pki/images - return 0 if !copy_directory( - "$common_ui_subsystem_path/images", - "$docroot_instance_path/pki/images", + $common_ui_subsystem_path, + "$docroot_instance_path/pki", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); @@ -2116,19 +2100,11 @@ sub process_pki_directories $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 + # Copy /usr/share/pki/server/webapps/pki/admin + # to <instance>/webapp/<subsystem>/admin return 0 if !copy_directory( - "$common_ui_subsystem_path/admin/console/js", - "$webapps_subsystem_instance_path/admin/console/js", + "$pki_subsystem_common_area/server/webapps/pki/admin", + "$webapps_subsystem_instance_path/admin", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); |