summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2019-10-16 11:58:59 -0500
committerJorge Hernandez <jorge.hernandez-herrero@att.com>2019-10-17 13:52:21 +0000
commit8f6a9a6df2ab7255bddbbdfb9ee03aa5713674d0 (patch)
tree348a80c27ae5c37ec4029f411dce964b9d538d60
parentc19f81387f4efc666cfa45b000275f3ee7c1d9d1 (diff)
override cert stores
Issue-ID: POLICY-2064 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ia98f383de7e1946e49c1f2c6117f2065c84ad26e
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh17
1 files changed, 14 insertions, 3 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
index 4c58294e..a11472c0 100644
--- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
@@ -37,13 +37,24 @@ if [ -z "$CONFIG_FILE" ]
CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json"
fi
-if [[ -f ${POLICY_HOME}/etc/mounted/xacml.properties ]]; then
+if [[ -f "${POLICY_HOME}"/etc/mounted/policy-truststore ]]; then
+ echo "overriding policy-truststore"
+ cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}"
+fi
+
+if [[ -f "${POLICY_HOME}"/etc/mounted/policy-keystore ]]; then
+ echo "overriding policy-keystore"
+ cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}"
+fi
+
+if [[ -f "${POLICY_HOME}"/etc/mounted/xacml.properties ]]; then
+ echo "overriding xacml.properties in guards application"
cp -f "${POLICY_HOME}"/etc/mounted/xacml.properties "${POLICY_HOME}"/apps/guard/
fi
# Create operationshistory table
-${POLICY_HOME}/mysql/bin/create-guard-table.sh
+"${POLICY_HOME}"/mysql/bin/create-guard-table.sh
echo "Policy Xacml PDP config file: $CONFIG_FILE"
-$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pdpx.main.startstop.Main -c $CONFIG_FILE \ No newline at end of file
+$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pdpx.main.startstop.Main -c $CONFIG_FILE