summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/scriptlets
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-03-11 21:17:53 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2013-03-19 12:57:17 -0400
commit22d50cc526c7fd4224a4d5a0ae9ebf66afd8e83a (patch)
tree9bf60845d64b5268b5962d18ae2071cbffcba394 /base/deploy/src/scriptlets
parenta3b4489e219d5807133e67b5f2b10c320ecaf8a4 (diff)
downloadpki-22d50cc526c7fd4224a4d5a0ae9ebf66afd8e83a.tar.gz
pki-22d50cc526c7fd4224a4d5a0ae9ebf66afd8e83a.tar.xz
pki-22d50cc526c7fd4224a4d5a0ae9ebf66afd8e83a.zip
Replaced Tomcat's random number generator.
By default Tomcat relies on /dev/random as a random number generator to generate the session ID's. Under certain conditions /dev/random may block, which will block Tomcat as well. To solve the problem all webapps in Tomcat have been configured to use the random number generator provided by JSS. Ticket #524
Diffstat (limited to 'base/deploy/src/scriptlets')
-rw-r--r--base/deploy/src/scriptlets/webapp_deployment.py18
1 files changed, 16 insertions, 2 deletions
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index 4948babbb..e72752ee8 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -57,19 +57,19 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
master['pki_tomcat_webapps_root_path'],
overwrite_flag=True)
+ util.directory.create(master['pki_tomcat_webapps_common_path'])
+
# If desired and available,
# copy selected server theme
# to <instance>/webapps/pki
if config.str2bool(master['pki_theme_enable']) and\
os.path.exists(master['pki_theme_server_dir']):
- util.directory.create(master['pki_tomcat_webapps_common_path'])
util.directory.copy(master['pki_theme_server_dir'],
master['pki_tomcat_webapps_common_path'],
overwrite_flag=True)
# Copy /usr/share/pki/server/webapps/pki/js
# to <instance>/webapps/pki/js
- util.directory.create(master['pki_tomcat_webapps_subsystem_path'])
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
@@ -82,6 +82,20 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
"js"),
overwrite_flag=True)
+ # Copy /usr/share/pki/server/webapps/pki/META-INF
+ # to <instance>/webapps/pki/META-INF
+ util.directory.copy(
+ os.path.join(
+ config.PKI_DEPLOYMENT_SOURCE_ROOT,
+ "server",
+ "webapps",
+ "pki",
+ "META-INF"),
+ os.path.join(
+ master['pki_tomcat_webapps_common_path'],
+ "META-INF"),
+ overwrite_flag=True)
+
# Copy /usr/share/pki/server/webapps/pki/admin
# to <instance>/webapps/<subsystem>/admin
# TODO: common templates should be deployed in common webapp