diff options
| author |   liboNet <libo.zhu@intel.com> | 2018-12-18 09:22:00 +0800 |
|---|---|---|
| committer | liboNet <libo.zhu@intel.com> | 2018-12-19 12:29:10 +0800 |
| commit | fc32c230809a051bc1c17e8a2a447210822eebe7 (patch) | |
| tree | 17bbbd6f9b235bfadca792f3750baecde51f78d0 /packages/policy-distribution-docker/src | |
| parent | 987cb61f269572fec7c0b0fe500f081ca36c2dd9 (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>
Diffstat (limited to 'packages/policy-distribution-docker/src')
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile index e1349775..3168d72b 100644 --- a/packages/policy-distribution-docker/src/main/docker/Dockerfile +++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile @@ -28,8 +28,8 @@ RUN \ RUN groupadd policy RUN useradd --create-home --shell /bin/bash -g policy policy -RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} && \ - chown policy:policy ${POLICY_HOME} ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} +RUN mkdir -p ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl && \ + chown -R policy:policy ${POLICY_HOME} ${POLICY_DISTRIBUTION_HOME} ${POLICY_LOGS} RUN mkdir /packages COPY /maven/* /packages @@ -39,6 +39,7 @@ RUN rm /packages/policy-distribution.tar.gz WORKDIR ${POLICY_DISTRIBUTION_HOME} COPY policy-dist.sh bin/. RUN chown -R policy:policy * && chmod +x bin/*.sh +RUN cp ${POLICY_DISTRIBUTION_HOME}/etc/ssl/* ${POLICY_HOME}/etc/ssl && chown policy:policy ${POLICY_HOME}/etc/ssl/* USER policy WORKDIR ${POLICY_DISTRIBUTION_HOME}/bin 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 |