From 70a0dd855426c4bab4a17cb5b2731f48f049c4be Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Thu, 1 Nov 2012 21:06:21 -0400
Subject: Merged theme files.

Currently the theme files are copied into each subsystem during
deployment creating duplicates. To reduce the problem the files
should be combined into a common folder /pki.

The process will be done over several patches. Initially this patch
will copy the images and CSS files into /pki/images and /pki/css.
Subsequent patches will update references to these files to the new
location. When it's done, the files no longer need to be copied
into each subsystem.

Ticket #328
---
 base/setup/pkicreate | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'base/setup/pkicreate')

diff --git a/base/setup/pkicreate b/base/setup/pkicreate
index 506e766ef..767960778 100755
--- a/base/setup/pkicreate
+++ b/base/setup/pkicreate
@@ -2061,11 +2061,42 @@ 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/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(
+            "$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/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
-- 
cgit