summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-06 22:17:18 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-06 22:17:18 -0500
commitafeb36d9789219a4877b446b9c4551815a284c12 (patch)
treecfafe31cc39df4dd550a0120acdeeaef976ee086
parent34cae26a998f8d8aadf28a448603b93f42c3972f (diff)
downloadpki-afeb36d9789219a4877b446b9c4551815a284c12.zip
pki-afeb36d9789219a4877b446b9c4551815a284c12.tar.gz
pki-afeb36d9789219a4877b446b9c4551815a284c12.tar.xz
Deploy common images.
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py24
-rwxr-xr-xbase/setup/pkicreate8
2 files changed, 0 insertions, 32 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index f2673df..02601e8 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -76,18 +76,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
master['pki_tomcat_webapps_common_path'],
"images")
- # Copy /usr/share/pki/common-ui/admin/console/img
- # to <instance>/webapp/pki/images
- util.directory.copy(
- os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "common-ui",
- "admin",
- "console",
- "img"),
- common_images,
- overwrite_flag=True)
-
# Copy /usr/share/pki/common-ui/css
# to <instance>/webapp/pki/css
util.directory.copy(
@@ -263,18 +251,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
master['pki_tomcat_webapps_common_path'],
"images")
- # Copy /usr/share/pki/common-ui/admin/console/img
- # to <instance>/webapp/pki/images
- util.directory.copy(
- os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "common-ui",
- "admin",
- "console",
- "img"),
- common_images,
- overwrite_flag=True)
-
# Copy /usr/share/pki/common-ui/css
# to <instance>/webapp/pki/css
util.directory.copy(
diff --git a/base/setup/pkicreate b/base/setup/pkicreate
index 5cb5e94..0e2ebe2 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(