diff options
| author |   liamfallon <liam.fallon@est.tech> | 2022-09-09 10:43:49 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2022-09-09 10:43:54 +0100 |
| commit | 8795d058043fc97e2375f3fa3ecd183bd5fcb36a (patch) | |
| tree | bec210828074ab1d7cd85852c000c9bc98bf8a02 /packages/policy-clamp-docker/src/main/docker/policy-participant.sh | |
| parent | 6f8e4ebb913ed92d5d6c86b518587488ffd33021 (diff) | |
Allow HTTPS to be configured in ACMjakarta
HTTPS is hard-coded in the ACM startup scripts in Jakarta.
Issue-ID: POLICY-4338
Change-Id: I9dfc93d5b951f5a08b0d1aa5e70b9a206d802f58
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'packages/policy-clamp-docker/src/main/docker/policy-participant.sh')
| -rw-r--r-- | packages/policy-clamp-docker/src/main/docker/policy-participant.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh index 77cd0c02b..fe9cf69fe 100644 --- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh # # ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. +# Copyright (C) 2021-2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" @@ -27,15 +26,13 @@ TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" if [ "$#" -eq 1 ]; then CONFIG_FILE=$1 -else - CONFIG_FILE=${CONFIG_FILE} fi if [ -z "$CONFIG_FILE" ]; then CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml" fi -echo "Policy clamp config file: $CONFIG_FILE" +echo "Policy clamp policy participant config file: $CONFIG_FILE" if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then echo "overriding policy-truststore" @@ -52,14 +49,11 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/ fi -touch /app/app.jar -mkdir -p "${POLICY_HOME}"/config/ -cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/PolicyParticipantParameters.yaml - -$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ +$JAVA_HOME/bin/java \ + -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ -Dserver.ssl.keyStore="${KEYSTORE}" \ -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ -jar /app/app.jar \ - --spring.config.location="${POLICY_HOME}/config/PolicyParticipantParameters.yaml" + --spring.config.location="${CONFIG_FILE}" |