From edf9c2273c00b52b0c240bc0c75dc1ba7bdc396e Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 9 Nov 2012 01:51:54 -0500
Subject: Reorganized common templates.

The common templates have moved from common-ui into base/common.
The deployment tools have been updated to use the new location.

Ticket #407
---
 base/setup/pkicreate | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

(limited to 'base/setup')

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);
 
-- 
cgit