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 15:30:04 -0500 |
| commit | fd12459c8c01052e8d6ae17a1be1c9b1942117d5 (patch) | |
| tree | 09bde3bc7c7adf736f65c9a861de2b02bd58816a /base/deploy/src/scriptlets/instance_layout.py | |
| parent | 47e582ad2b2a64dc739006c8e75b115d95e78d1b (diff) | |
| download | pki-fd12459c8c01052e8d6ae17a1be1c9b1942117d5.tar.gz pki-fd12459c8c01052e8d6ae17a1be1c9b1942117d5.tar.xz pki-fd12459c8c01052e8d6ae17a1be1c9b1942117d5.zip | |
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
Diffstat (limited to 'base/deploy/src/scriptlets/instance_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 43 |
1 files changed, 7 insertions, 36 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 41327252a..85f312fed 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -72,28 +72,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_tomcat_webapps_path']) util.directory.create(master['pki_tomcat_webapps_common_path']) - # Copy /usr/share/pki/common-ui/css - # to <instance>/webapp/pki/css + # Copy /usr/share/pki/common-ui + # to <instance>/webapp/pki util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "css"), - os.path.join( - master['pki_tomcat_webapps_common_path'], - "css"), - overwrite_flag=True) - - # 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", - "images"), - os.path.join( - master['pki_tomcat_webapps_common_path'], - "images"), + "common-ui"), + master['pki_tomcat_webapps_common_path'], overwrite_flag=True) util.directory.create(master['pki_tomcat_webapps_root_path']) @@ -200,28 +185,14 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.modify(master['pki_instance_lib_log4j_properties']) util.directory.modify(master['pki_tomcat_webapps_path']) - # Copy /usr/share/pki/common-ui/css - # to <instance>/webapp/pki/css + # Copy /usr/share/pki/common-ui + # to <instance>/webapp/pki util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", "css"), - os.path.join( - master['pki_tomcat_webapps_common_path'], - "css"), - overwrite_flag=True) - - # 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", - "images"), - os.path.join( - master['pki_tomcat_webapps_common_path'], - "images"), + master['pki_tomcat_webapps_common_path'], overwrite_flag=True) util.directory.copy( |