From 1ee44923b78684229e32301d57e74e770621fe9c Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 19 Jan 2017 20:50:42 +0100
Subject: 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
---
 .../deployment/scriptlets/instance_layout.py       | 36 +++-------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

(limited to 'base/server/python')

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'])
-- 
cgit