diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-05 15:59:44 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-11 09:55:06 -0500 |
commit | fb80a25498513a5f5242acfd185d2db2d3b6e8c1 (patch) | |
tree | f9b950d578a15fcb6c3e27b2f4439bea6bd0c8ff /base/deploy/src/scriptlets/webapp_deployment.py | |
parent | 4109bc317073df1ffade06d7d01a542a422d7976 (diff) | |
download | pki-fb80a25498513a5f5242acfd185d2db2d3b6e8c1.tar.gz pki-fb80a25498513a5f5242acfd185d2db2d3b6e8c1.tar.xz pki-fb80a25498513a5f5242acfd185d2db2d3b6e8c1.zip |
Updated tools to deploy combined images and CSS files.
The pkispawn and pkicreate have been updated to deploy the
combined images and CSS files from the common-ui into /pki/images
and /pki/css.
The common Velocity templates and JavaScript files still need to
be deployed from the <subsystem>-ui packages into each subsystem.
Ticket #328
Diffstat (limited to 'base/deploy/src/scriptlets/webapp_deployment.py')
-rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index ad7235c18..4c15256bd 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -44,14 +44,42 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - # deploy war file + + # deploy webapp util.directory.create(master['pki_tomcat_webapps_subsystem_path']) + + # Copy /usr/share/pki/common-ui/admin/console/config + # to <instance>/webapp/<subsystem>/admin/console/config util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui"), - master['pki_tomcat_webapps_subsystem_path'], + "common-ui", + "admin", + "console", + "config"), + os.path.join( + master['pki_tomcat_webapps_subsystem_path'], + "admin", + "console", + "config"), overwrite_flag=True) + + # Copy /usr/share/pki/common-ui/admin/console/js + # to <instance>/webapp/<subsystem>/admin/console/js + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "common-ui", + "admin", + "console", + "js"), + os.path.join( + master['pki_tomcat_webapps_subsystem_path'], + "admin", + "console", + "js"), + overwrite_flag=True) + util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, |