diff options
| author |   Jim Hahn <jrh3@att.com> | 2018-05-21 15:02:40 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2018-05-23 14:57:16 -0400 |
| commit | ee033842018375e0200a9b8f2e0dc813974440fd (patch) | |
| tree | 9e6ebcb9dd132cb8f4ef3e6dac216ec467516f6f /packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh | |
| parent | 1da6b3b6a28f40322a13e6fb5142206f1eefa027 (diff) | |
Replace LOGPATH with LOGSUFFIX
docker-install.sh does not expand ${{xxx}} values in .conf
files before using them to update target files. Consequently,
replaced LOGPATH with LOGSUFFIX in .conf files and updated
target files to use ${{POLICY_LOGS}}${{LOGSUFFIX}} instead.
Replace "${POLICY_HOME}/logs" in auxiliary files (e.g., logrotate)
with "${POLICY_LOGS}/policy".
Update license dates.
In .sh files, changed ${{POLICY_LOGS}} to ${POLICY_LOGS}, and
ensured that env.sh is sourced.
Use hard-coded paths in conf files instead of replacing
LOGPATH with LOGSUFFIX.
Update license dates.
Repoint path for IntegrityMonitor.log, as we cannot easily move
since it's in common.
Replace hard-coded log path in docker-install.sh.
Undo hard-coded log paths where possible, and modify scripts to
pass $POLICY_LOGS to JVM.
Change-Id: I027d8d2173ae97fef73b0daff1d6a87452857f93
Issue-ID: POLICY-759
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh')
| -rw-r--r-- | packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh b/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh index 0ba7ab8e4..dc9bfbc36 100644 --- a/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh +++ b/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP Policy Engine # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.keyStore=${POLICY_HOME}/etc/ssl/ CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWD}" CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStore=${POLICY_HOME}/etc/ssl/policy-keystore" CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStorePassword=${KEYSTORE_PASSWD}" +CATALINA_OPTS="${CATALINA_OPTS} -DPOLICY_LOGS=${POLICY_LOGS}" CATALINA_OPTS="${CATALINA_OPTS} -Xms${{TOMCAT_X_MS_MB}}M" CATALINA_OPTS="${CATALINA_OPTS} -Xmx${{TOMCAT_X_MX_MB}}M" export CATALINA_OPTS |