From cfa428a43f752a295726ac1d51cad25b2ed3a989 Mon Sep 17 00:00:00 2001 From: jhh Date: Mon, 15 Jun 2020 09:37:35 -0500 Subject: get cert store passwords from env Issue-ID: POLICY-2575 Signed-off-by: jhh Change-Id: Icd6395fe4403b1fc2dd838a5ecdd3295f42639d2 --- packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 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 a8773877..a607f685 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh @@ -1,7 +1,7 @@ #!/bin/bash -xv # # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2019-2020 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,10 +21,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 [ "$#" -ge 1 ]; then CONFIG_FILE=$1 @@ -62,4 +59,4 @@ fi echo "Policy Xacml PDP 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.pdpx.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.pdpx.main.startstop.Main -c $CONFIG_FILE -- cgit 1.2.3-korg