Merge "Documentation OOF Spec"

diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/CryptoUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/CryptoUtils.java
index 5496f0d..74f6641 100644 (file)
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/CryptoUtils.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/CryptoUtils.java
@@ -145,10 +145,10 @@ public class CryptoUtils {
                        return decryptTxt(encryptedTxt);
                } catch (Exception e) {
                        try {
-                               LOGGER.error("decryptTxtNoEx: Exception while decryption : " + e);
+                               LOGGER.warn("decryptTxtNoEx: Exception while decryption : " + e);
                                return (encryptedTxt != null) ? encryptedTxt.getBytes(StandardCharsets.UTF_8) : new byte[0];
                        } catch (Exception e1) {
-                               LOGGER.error("decryptTxtNoEx: Exception on sending default : " + e1);
+                               LOGGER.warn("decryptTxtNoEx: Exception on sending default : " + e1);
                                return new byte[0];
                        }
                }

diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf
index 5f0ff7d..25a2a35 100644 (file)
--- a/packages/install/src/files/base.conf
+++ b/packages/install/src/files/base.conf
@@ -20,6 +20,7 @@
 
 JAVA_HOME=/usr/lib/jvm/java-8-oracle
 POLICY_HOME=/opt/app/policy
+POLICY_LOGS=/opt/app/policy/logs
 KEYSTORE_PASSWD=PolicyR0ck$
 
 JDBC_DRIVER=org.mariadb.jdbc.Driver

diff --git a/packages/install/src/files/paplp.conf b/packages/install/src/files/paplp.conf
index 13e3218..c3fb62e 100755 (executable)
--- 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_LOGS}}/policy/pap/pap-rest.log
+PARSERLOGPATH=${{POLICY_LOGS}}/policy/pap/IntegrityMonitor.log
 
 node_type=logparser
 # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase