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-service/src/main | |
| parent | f6e3a03d216e0ed96715199c75445a3f25804152 (diff) | |
| parent | 17e160784612a0faa782eb7069be91532b4dfabc (diff) | |
Merge "Update container startup for SSL"
Diffstat (limited to 'cmso-service/src/main')
| -rw-r--r-- | cmso-service/src/main/docker/extra-files/startService.sh | 22 | ||||
| -rw-r--r-- | cmso-service/src/main/docker/extra-files/startService.sh.bak | 4 |
2 files changed, 20 insertions, 6 deletions
diff --git a/cmso-service/src/main/docker/extra-files/startService.sh b/cmso-service/src/main/docker/extra-files/startService.sh index d040bd9..7cbed3d 100644 --- a/cmso-service/src/main/docker/extra-files/startService.sh +++ b/cmso-service/src/main/docker/extra-files/startService.sh @@ -1,10 +1,28 @@ #!/bin/sh AUTHENTICATION=${AUTHENTICATION:-proprietary-auth} -JAVA_TRUSTSTORE=${JAVA_TRUSTSTORE:-etc/config/truststoreONAPall.jks} VM_ARGS="${VM_ARGS} -Dserver.local.startpath=${RESOURCES_HOME}" -VM_ARGS="${VM_ARGS} -Djavax.net.ssl.trustStore==${JAVA_TRUSTSTORE}" + +if [ "${JAVA_TRUSTSTORE}" != '' ] +then + VM_ARGS="${VM_ARGS} -Djavax.net.ssl.trustStore=${JAVA_TRUSTSTORE}" +fi + +if [ "${JAVA_TRUSTSTORE_PASSWORD}" != '' ] +then + 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}" +fi + +if [ "${SSL_KEYSTORE_PASSWORD}" != '' ] +then + VM_ARGS="${VM_ARGS} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}" +fi echo "VM_ARGS="${VM_ARGS} diff --git a/cmso-service/src/main/docker/extra-files/startService.sh.bak b/cmso-service/src/main/docker/extra-files/startService.sh.bak deleted file mode 100644 index dbd111f..0000000 --- a/cmso-service/src/main/docker/extra-files/startService.sh.bak +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -echo "VM_ARGS="${VM_ARGS} - -java -Djava.security.egd=file:/dev/./urandom ${VM_ARGS} -Xms256m -Xmx1024m -jar ./app.jar |