diff options
| author |   liboNet <libo.zhu@intel.com> | 2018-12-18 09:22:00 +0800 |
|---|---|---|
| committer |   Pamela Dragosh <pdragosh@research.att.com> | 2019-01-07 17:22:54 +0000 |
| commit | 2511b36968b84151c67d7227c043bf90855ce161 (patch) | |
| tree | a9bfb7c06d4b6a9a1583f487dd179b85cc3886f9 /packages/policy-distribution-docker/src/main/docker/policy-dist.sh | |
| parent | 964ac3e2a2e6919a8a20895c286312cd0c8f200f (diff) | |
add Https support for distribution endpoints
. add the https into the RestServerParameters interface
. update CommonTestData to support https interface
. add two cases for healthcheck and statistic https validation
. update the package script to use JVM properties
. add keystore and truststore to resources dir
. update the keystore path for consistency
Change-Id: I04b2a3e1afef84eafbb6a22e6fe2122a5a181883
Issue-ID: POLICY-1221
Signed-off-by: liboNet <libo.zhu@intel.com>
(cherry picked from commit fc32c230809a051bc1c17e8a2a447210822eebe7)
Diffstat (limited to 'packages/policy-distribution-docker/src/main/docker/policy-dist.sh')
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 7 |
1 files changed, 6 insertions, 1 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 ebb6b8d2..91d7290d 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -21,6 +21,11 @@ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ POLICY_DISTRIBUTION_HOME=/opt/app/policy/distribution +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 @@ -35,4 +40,4 @@ fi echo "Policy distribution config file: $CONFIG_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_DISTRIBUTION_HOME/etc:$POLICY_DISTRIBUTION_HOME/lib/*" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE +$JAVA_HOME/bin/java -cp "$POLICY_DISTRIBUTION_HOME/etc:$POLICY_DISTRIBUTION_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStore="$TRUSTSTORE_PASSWD" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE |