diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-01-19 20:50:42 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-01-30 21:20:32 +0100 |
| commit | 1ee44923b78684229e32301d57e74e770621fe9c (patch) | |
| tree | aae62cefbea90edfee38693c14414b272d687472 /base/server/python/pki/server | |
| parent | 2fa7bc707a558da1b0c4d748d0805bdd0b60168c (diff) | |
| download | pki-1ee44923b78684229e32301d57e74e770621fe9c.tar.gz pki-1ee44923b78684229e32301d57e74e770621fe9c.tar.xz pki-1ee44923b78684229e32301d57e74e770621fe9c.zip | |
Merged /pki webapps.
Previously the /pki webapp was only added if the theme was present
during installation, and there were separate webapps for /pki/admin
and /pki/js. If the theme was installed later, the /pki webapp had
to be configured manually.
To simplify the installation and to support other developments
(e.g. login banner), the /pki webapp will always be added during
installation regardless of theme, and the /pki/admin and /pki/js
webapps are merged into /pki webapp. When the theme package is
installed, it will create links in /pki webapp so the theme files
will become available without additional configuration.
An upgrade script has been added to merge the /pki webapp in
existing instances.
https://fedorahosted.org/pki/ticket/2582
Diffstat (limited to 'base/server/python/pki/server')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/instance_layout.py | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index 330aa46f7..a9a2840c7 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -88,46 +88,20 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "localhost", "ROOT.xml")) - if os.path.exists(deployer.mdict['pki_theme_server_dir']): - # Deploy theme web application if available - deployer.deploy_webapp( - "pki", - deployer.mdict['pki_theme_server_dir'], - os.path.join( - deployer.mdict['pki_source_server_path'], - "Catalina", - "localhost", - "pki.xml")) - - # Deploy admin templates - deployer.deploy_webapp( - "pki#admin", - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "pki", - "admin"), - os.path.join( - deployer.mdict['pki_source_server_path'], - "Catalina", - "localhost", - "pki#admin.xml")) - - # Deploy JS library + # Deploy pki web application which includes themes, + # admin templates, and JS libraries deployer.deploy_webapp( - "pki#js", + "pki", os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "server", "webapps", - "pki", - "js"), + "pki"), os.path.join( deployer.mdict['pki_source_server_path'], "Catalina", "localhost", - "pki#js.xml")) + "pki.xml")) # Create Tomcat instance library deployer.directory.create(deployer.mdict['pki_instance_lib']) |