summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-06 18:03:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-06 22:13:11 -0500
commitc7e5383e5383c7fbeacd4c4e3142b6bf2db83e45 (patch)
treefc9edac0df9f65cc92a93d7d6ddde33e468b7b4f
parentc106dc82a6e00ca91afbdee8a4c73afdea8b6e6d (diff)
downloadpki-c7e5383e5383c7fbeacd4c4e3142b6bf2db83e45.zip
pki-c7e5383e5383c7fbeacd4c4e3142b6bf2db83e45.tar.gz
pki-c7e5383e5383c7fbeacd4c4e3142b6bf2db83e45.tar.xz
Deploy images from common-ui.
Ticket #328
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py8
-rwxr-xr-xbase/setup/pkicreate4
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 b4d1a50..f2673df 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 <instance>/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 <instance>/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 b5a9047..5cb5e94 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 <instance>/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);