diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2013-03-05 18:32:14 -0800 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2013-03-05 20:11:52 -0800 |
| commit | cead7472df922841bd6648cc82f917351b3c1648 (patch) | |
| tree | 3bbc620e2b25128ea0851a4de3377ab9f95b64e8 /base/deploy/src/scriptlets | |
| parent | f49c98ca0cbfc0def8f055c2d97c031ff0f4a439 (diff) | |
| download | pki-cead7472df922841bd6648cc82f917351b3c1648.tar.gz pki-cead7472df922841bd6648cc82f917351b3c1648.tar.xz pki-cead7472df922841bd6648cc82f917351b3c1648.zip | |
PKI theme changes
* Correct PKI Theme for RA and TPS:
** TRAC Ticket #517 - Clean up theme dependencies
* Make PKI Theme optional for CA, KRA, OCSP, TKS:
** Bugzilla Bug #916134 - unresolved dependency in pki-server: pki-server-theme
** TRAC Ticket #518 - Remove UI dependencies from pkispawn . . .
Diffstat (limited to 'base/deploy/src/scriptlets')
| -rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index 958d5e271..4948babbb 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -57,15 +57,15 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_tomcat_webapps_root_path'], overwrite_flag=True) - # Copy /usr/share/pki/common-ui + # If desired and available, + # copy selected server theme # to <instance>/webapps/pki - util.directory.create(master['pki_tomcat_webapps_common_path']) - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui"), - master['pki_tomcat_webapps_common_path'], - overwrite_flag=True) + if config.str2bool(master['pki_theme_enable']) and\ + os.path.exists(master['pki_theme_server_dir']): + util.directory.create(master['pki_tomcat_webapps_common_path']) + util.directory.copy(master['pki_theme_server_dir'], + master['pki_tomcat_webapps_common_path'], + overwrite_flag=True) # Copy /usr/share/pki/server/webapps/pki/js # to <instance>/webapps/pki/js |