summaryrefslogtreecommitdiffstats
path: root/packages/base/src/files/etc
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-05-21 15:02:40 -0400
committerJim Hahn <jrh3@att.com>2018-05-23 14:57:16 -0400
commitee033842018375e0200a9b8f2e0dc813974440fd (patch)
tree9e6ebcb9dd132cb8f4ef3e6dac216ec467516f6f /packages/base/src/files/etc
parent1da6b3b6a28f40322a13e6fb5142206f1eefa027 (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/etc')
-rw-r--r--packages/base/src/files/etc/logrotate.d/elk.conf2
-rw-r--r--packages/base/src/files/etc/logrotate.d/monitor.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/base/src/files/etc/logrotate.d/elk.conf b/packages/base/src/files/etc/logrotate.d/elk.conf
index fc26f8991..74ec0ccf6 100644
--- a/packages/base/src/files/etc/logrotate.d/elk.conf
+++ b/packages/base/src/files/etc/logrotate.d/elk.conf
@@ -18,7 +18,7 @@
#============LICENSE_END==================================================
#
-${{POLICY_HOME}}/logs/elk.log {
+${{POLICY_LOGS}}/policy/elk.log {
daily
rotate 10
compress
diff --git a/packages/base/src/files/etc/logrotate.d/monitor.conf b/packages/base/src/files/etc/logrotate.d/monitor.conf
index 6852a937f..7304103a7 100644
--- a/packages/base/src/files/etc/logrotate.d/monitor.conf
+++ b/packages/base/src/files/etc/logrotate.d/monitor.conf
@@ -18,7 +18,7 @@
#============LICENSE_END==================================================
#
-${{POLICY_HOME}}/logs/monitor.log {
+${{POLICY_LOGS}}/policy/monitor.log {
daily
rotate 10
compress