From 17e160784612a0faa782eb7069be91532b4dfabc Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Wed, 17 Apr 2019 13:01:55 -0400 Subject: Update container startup for SSL Issue-ID: OPTFRA-391 Change-Id: I6cbc831511b6378c6660ab37ab3ec8062ac07359 Signed-off-by: Jerry Flood --- cmso-optimizer/src/main/docker/extra-files/startService.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmso-optimizer/src/main') diff --git a/cmso-optimizer/src/main/docker/extra-files/startService.sh b/cmso-optimizer/src/main/docker/extra-files/startService.sh index 0549dfd..7cbed3d 100644 --- a/cmso-optimizer/src/main/docker/extra-files/startService.sh +++ b/cmso-optimizer/src/main/docker/extra-files/startService.sh @@ -4,24 +4,24 @@ AUTHENTICATION=${AUTHENTICATION:-proprietary-auth} VM_ARGS="${VM_ARGS} -Dserver.local.startpath=${RESOURCES_HOME}" -if [ "${JAVA_TRUSTSTORE}" != ''] +if [ "${JAVA_TRUSTSTORE}" != '' ] then - VM_ARGS="${VM_ARGS} -Djavax.net.ssl.trustStore=${JAVA_TRUSTSTORE}" + VM_ARGS="${VM_ARGS} -Djavax.net.ssl.trustStore=${JAVA_TRUSTSTORE}" fi -if [ "${JAVA_TRUSTSTORE_PASSWORD}" != ''] +if [ "${JAVA_TRUSTSTORE_PASSWORD}" != '' ] then - VM_ARGS="${VM_ARGS} -Djavax.net.ssl.trustStorePassword=${JAVA_TRUSTSTORE_PASSWORD}" + VM_ARGS="${VM_ARGS} -Djavax.net.ssl.trustStorePassword=${JAVA_TRUSTSTORE_PASSWORD}" fi if [ "${SSL_KEYSTORE}" != '' ] then - VM_ARGS="${VM_ARGS} -Dserver.ssl.key-store=${SSL_KEYSTORE}" + VM_ARGS="${VM_ARGS} -Dserver.ssl.key-store=${SSL_KEYSTORE}" fi if [ "${SSL_KEYSTORE_PASSWORD}" != '' ] then - VM_ARGS="${VM_ARGS} -Dserver.ssl.key-password=${SSL_KEYSTORE_PASSWORD}" + VM_ARGS="${VM_ARGS} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}" fi echo "VM_ARGS="${VM_ARGS} -- cgit 1.2.3-korg