diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-09 03:36:17 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-09 15:30:10 -0500 |
| commit | aec211595ec1e218b3d32280eb0c092cfbc95f45 (patch) | |
| tree | cda5a5360da145824e101f6b6c0f77f0e698f8ca /base/deploy/src/scriptlets/webapp_deployment.py | |
| parent | fd12459c8c01052e8d6ae17a1be1c9b1942117d5 (diff) | |
| download | pki-aec211595ec1e218b3d32280eb0c092cfbc95f45.tar.gz pki-aec211595ec1e218b3d32280eb0c092cfbc95f45.tar.xz pki-aec211595ec1e218b3d32280eb0c092cfbc95f45.zip | |
Reorganized CA, KRA, OCSP, TKS templates.
All remaining theme files for Tomcat subsystems which include
the templates and JS files have been moved from the theme folder
at <subsystem>-ui/shared/webapps/<subsystem> into the subsystem
webapp folder at base/<subsystem>/shared/webapps/<subsystem>.
The deployment tools have been updated to use the new location.
Ticket #407
Diffstat (limited to 'base/deploy/src/scriptlets/webapp_deployment.py')
| -rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index 68fff20bd..3838baeb4 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -62,14 +62,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "admin"), overwrite_flag=True) - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower()), - master['pki_tomcat_webapps_subsystem_path'], - overwrite_flag=True) + # Copy /usr/share/pki/<subsystem>/webapps/<subsystem> + # to <instance>/webapps/<subsystem> util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, @@ -78,6 +72,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_subsystem'].lower()), master['pki_tomcat_webapps_subsystem_path'], overwrite_flag=True) + util.directory.create( master['pki_tomcat_webapps_subsystem_webinf_classes_path']) util.directory.create( @@ -133,14 +128,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "admin"), overwrite_flag=True) - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower()), - master['pki_tomcat_webapps_subsystem_path'], - overwrite_flag=True) + # Copy /usr/share/pki/<subsystem>/webapps/<subsystem> + # to <instance>/webapps/<subsystem> util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, @@ -149,6 +138,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_subsystem'].lower()), master['pki_tomcat_webapps_subsystem_path'], overwrite_flag=True) + # update Tomcat webapps subsystem WEB-INF lib symbolic links if master['pki_subsystem'] == "CA": util.symlink.modify(master['pki_ca_jar_link']) |