summaryrefslogtreecommitdiffstats
path: root/base/deploy/src
diff options
context:
space:
mode:
Diffstat (limited to 'base/deploy/src')
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py69
-rw-r--r--base/deploy/src/scriptlets/webapp_deployment.py34
2 files changed, 36 insertions, 67 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index f45293104..cf8e42d4f 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -72,22 +72,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
util.directory.create(master['pki_tomcat_webapps_path'])
util.directory.create(master['pki_tomcat_webapps_common_path'])
- common_images = os.path.join(
- master['pki_tomcat_webapps_common_path'],
- "images")
-
- # Copy /usr/share/pki/common-ui/admin/console/img
- # to <instance>/webapp/pki/images
- util.directory.copy(
- os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "common-ui",
- "admin",
- "console",
- "img"),
- common_images,
- overwrite_flag=True)
-
# Copy /usr/share/pki/common-ui/css
# to <instance>/webapp/pki/css
util.directory.copy(
@@ -100,61 +84,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
"css"),
overwrite_flag=True)
- # Copy /usr/share/pki/common-ui/img
+ # Copy /usr/share/pki/common-ui/images
# to <instance>/webapp/pki/images
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
"common-ui",
- "img"),
- common_images,
+ "images"),
+ os.path.join(
+ master['pki_tomcat_webapps_common_path'],
+ "images"),
overwrite_flag=True)
- # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/admin/graphics
- # to <instance>/webapp/pki/images
- dir = os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- master['pki_subsystem'].lower() + "-ui",
- "webapps",
- master['pki_subsystem'].lower(),
- "admin",
- "graphics")
- if (util.directory.exists(dir)):
- util.directory.copy(
- dir,
- common_images,
- overwrite_flag=True)
-
- # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/agent/graphics
- # to <instance>/webapp/pki/images
- dir = os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- master['pki_subsystem'].lower() + "-ui",
- "webapps",
- master['pki_subsystem'].lower(),
- "agent",
- "graphics")
- if (util.directory.exists(dir)):
- util.directory.copy(
- dir,
- common_images,
- overwrite_flag=True)
-
- # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/ee/graphics
- # to <instance>/webapp/pki/images
- dir = os.path.join(
- config.PKI_DEPLOYMENT_SOURCE_ROOT,
- master['pki_subsystem'].lower() + "-ui",
- "webapps",
- master['pki_subsystem'].lower(),
- "ee",
- "graphics")
- if (util.directory.exists(dir)):
- util.directory.copy(
- dir,
- common_images,
- overwrite_flag=True)
-
util.directory.create(master['pki_tomcat_webapps_root_path'])
util.directory.copy(
os.path.join(
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index ad7235c18..4c15256bd 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -44,14 +44,42 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
return self.rv
config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__,
extra=config.PKI_INDENTATION_LEVEL_1)
- # deploy war file
+
+ # deploy webapp
util.directory.create(master['pki_tomcat_webapps_subsystem_path'])
+
+ # Copy /usr/share/pki/common-ui/admin/console/config
+ # to <instance>/webapp/<subsystem>/admin/console/config
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
- "common-ui"),
- master['pki_tomcat_webapps_subsystem_path'],
+ "common-ui",
+ "admin",
+ "console",
+ "config"),
+ os.path.join(
+ master['pki_tomcat_webapps_subsystem_path'],
+ "admin",
+ "console",
+ "config"),
overwrite_flag=True)
+
+ # Copy /usr/share/pki/common-ui/admin/console/js
+ # to <instance>/webapp/<subsystem>/admin/console/js
+ util.directory.copy(
+ os.path.join(
+ config.PKI_DEPLOYMENT_SOURCE_ROOT,
+ "common-ui",
+ "admin",
+ "console",
+ "js"),
+ os.path.join(
+ master['pki_tomcat_webapps_subsystem_path'],
+ "admin",
+ "console",
+ "js"),
+ overwrite_flag=True)
+
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,