aboutsummaryrefslogtreecommitdiffstats
path: root/packages/install
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/install
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/install')
-rwxr-xr-xpackages/install/src/files/paplp.conf4
-rwxr-xr-xpackages/install/src/files/pdplp.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/install/src/files/paplp.conf b/packages/install/src/files/paplp.conf
index c3fb62e19..de50a54a1 100755
--- a/packages/install/src/files/paplp.conf
+++ b/packages/install/src/files/paplp.conf
@@ -24,8 +24,8 @@ LOGPARSER_X_MS_MB=1024
LOGPARSER_X_MX_MB=1024
SERVER=https://${{FQDN}}:9091/pap/
-LOGPATH=${{POLICY_LOGS}}/policy/pap/pap-rest.log
-PARSERLOGPATH=${{POLICY_LOGS}}/policy/pap/IntegrityMonitor.log
+LOGPATH=${{POLICY_HOME}}/logs/policy/pap/pap-rest.log
+PARSERLOGPATH=${{POLICY_HOME}}/servers/paplp/bin/IntegrityMonitor.log
node_type=logparser
# the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase
diff --git a/packages/install/src/files/pdplp.conf b/packages/install/src/files/pdplp.conf
index 38f1696de..79442ee5b 100755
--- a/packages/install/src/files/pdplp.conf
+++ b/packages/install/src/files/pdplp.conf
@@ -24,8 +24,8 @@ LOGPARSER_X_MS_MB=1024
LOGPARSER_X_MX_MB=1024
SERVER=https://${{FQDN}}:8081/pdp/
-LOGPATH=${{POLICY_LOGS}}/policy/pdpx/pdp-rest.log
-PARSERLOGPATH=${{POLICY_LOGS}}/policy/pdpx/IntegrityMonitor.log
+LOGPATH=${{POLICY_HOME}}/logs/policy/pdpx/pdp-rest.log
+PARSERLOGPATH=${{POLICY_HOME}}/servers/pdplp/bin/IntegrityMonitor.log
node_type=logparser
# the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase