diff options
| author |   Vikas Varma <vv8305@att.com> | 2019-04-18 13:46:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-18 13:46:53 +0000 |
| commit | aa43946e74b52954bd8e16e59d5b53ccbae21350 (patch) | |
| tree | fd24ef76212f2fcd6e4fbc4cc5a303650f9aae8b /cmso-optimizer/src | |
| parent | f6e3a03d216e0ed96715199c75445a3f25804152 (diff) | |
| parent | 17e160784612a0faa782eb7069be91532b4dfabc (diff) | |
Merge "Update container startup for SSL"
Diffstat (limited to 'cmso-optimizer/src')
| -rw-r--r-- | cmso-optimizer/src/main/docker/extra-files/startService.sh | 12 |
1 files changed, 6 insertions, 6 deletions
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} |