summaryrefslogtreecommitdiffstats
path: root/base/deploy
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-09 03:36:17 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-12 12:04:02 -0500
commit46fda5d944772ac62675570037785e39c517002b (patch)
tree667f28137e53f7a5a4f55a7b64f169c69be7513b /base/deploy
parentedf9c2273c00b52b0c240bc0c75dc1ba7bdc396e (diff)
downloadpki-46fda5d944772ac62675570037785e39c517002b.tar.gz
pki-46fda5d944772ac62675570037785e39c517002b.tar.xz
pki-46fda5d944772ac62675570037785e39c517002b.zip
Reorganized CA, KRA, OCSP, TKS templates.
All remaining theme files for Tomcat subsystems which include the templates and JS files have been moved from the theme folder at <subsystem>-ui/shared/webapps/<subsystem> into the subsystem webapp folder at base/<subsystem>/shared/webapps/<subsystem>. The deployment tools have been updated to use the new location. Ticket #407
Diffstat (limited to 'base/deploy')
-rw-r--r--base/deploy/src/scriptlets/webapp_deployment.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index 9fca206e9..ff4818918 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -62,14 +62,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
"admin"),
overwrite_flag=True)
- util.directory.copy(
- os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- master['pki_subsystem'].lower() + "-ui",
- "webapps",
- master['pki_subsystem'].lower()),
- master['pki_tomcat_webapps_subsystem_path'],
- overwrite_flag=True)
+ # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
+ # to <instance>/webapps/<subsystem>
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
@@ -78,6 +72,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
master['pki_subsystem'].lower()),
master['pki_tomcat_webapps_subsystem_path'],
overwrite_flag=True)
+
util.directory.create(
master['pki_tomcat_webapps_subsystem_webinf_classes_path'])
util.directory.create(