summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2014-01-30 11:34:17 -0500
committerEndi S. Dewata <edewata@redhat.com>2014-02-06 16:24:22 -0500
commit49bfa844a220e8b01784963733f9aa72ff5252ae (patch)
treef83f76f820d464b0d5d79b9d49be39a2bd2f4244 /base
parent02f9be1caa6310b5758b96d56d946e04557459c7 (diff)
downloadpki-49bfa844a220e8b01784963733f9aa72ff5252ae.tar.gz
pki-49bfa844a220e8b01784963733f9aa72ff5252ae.tar.xz
pki-49bfa844a220e8b01784963733f9aa72ff5252ae.zip
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).
Diffstat (limited to 'base')
-rw-r--r--base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py16
1 files changed, 16 insertions, 0 deletions
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(