From 49bfa844a220e8b01784963733f9aa72ff5252ae Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 30 Jan 2014 11:34:17 -0500
Subject: Fixed template deployment.

The deployment scriptlet has been fixed to copy the templates to the
subsystem web application. This functionality was incorrectly removed
in a previous revision (5952a82975063c4ec27303091a44e586d1386933).
---
 .../server/deployment/scriptlets/webapp_deployment.py    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'base/server/python')

diff --git a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
index 70f2ccc88..975028d73 100644
--- a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
+++ b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
@@ -44,6 +44,22 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__,
                                 extra=config.PKI_INDENTATION_LEVEL_1)
 
+            # Copy /usr/share/pki/server/webapps/pki/admin
+            # to <instance>/webapps/<subsystem>/admin
+            # TODO: common templates should be deployed in common webapp
+            deployer.directory.create(deployer.master_dict['pki_tomcat_webapps_subsystem_path'])
+            deployer.directory.copy(
+                os.path.join(
+                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
+                    "server",
+                    "webapps",
+                    "pki",
+                    "admin"),
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_webapps_subsystem_path'],
+                    "admin"),
+                overwrite_flag=True)
+
             # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
             # to <instance>/webapps/<subsystem>
             deployer.directory.copy(
-- 
cgit