From 0720f985e3bdca7de47f9cc796a5cc6929ce8bd5 Mon Sep 17 00:00:00 2001 From: jhh Date: Mon, 15 Jun 2020 13:18:07 -0500 Subject: get cert store passwords from env Change-Id: I12d54c31b81e5088bea29d2392e5f6b357578673 Issue-ID: POLICY-2575 Signed-off-by: jhh --- packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh index f196e650..169bd5f8 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -22,9 +22,7 @@ JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" -KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" -TRUSTSTORE_PASSWD="Pol1cy_0nap" if [ "$#" -eq 1 ]; then CONFIG_FILE=$1 @@ -54,4 +52,4 @@ fi echo "Policy distribution config file: $CONFIG_FILE" -$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Dlogback.configurationFile=$POLICY_HOME/etc/logback.xml -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.distribution.main.startstop.Main -c $CONFIG_FILE +$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Dlogback.configurationFile=$POLICY_HOME/etc/logback.xml -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE -- cgit 1.2.3-korg