aboutsummaryrefslogtreecommitdiffstats
path: root/cmso-optimizer/src/main/docker/extra-files/startService.sh
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-04-16 09:06:17 -0400
committerJerry Flood <jflood@att.com>2019-04-16 11:29:13 -0400
commitb1ba8ef51edabee26acaf74e226eeb269297aec7 (patch)
tree54fcd741ae9b0f05ca1d438de1a4dbacf06cf1ac /cmso-optimizer/src/main/docker/extra-files/startService.sh
parent134ae90b8d8f5b19d9915adbc9b1a70d8c27540e (diff)
More checkstyle changes for Dublin
Issue-ID: OPTFRA-466 Change-Id: Ied602196284bf3aed56ff491a749f14503395c88 Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-optimizer/src/main/docker/extra-files/startService.sh')
-rw-r--r--cmso-optimizer/src/main/docker/extra-files/startService.sh21
1 files changed, 19 insertions, 2 deletions
diff --git a/cmso-optimizer/src/main/docker/extra-files/startService.sh b/cmso-optimizer/src/main/docker/extra-files/startService.sh
index 6efd912..0549dfd 100644
--- a/cmso-optimizer/src/main/docker/extra-files/startService.sh
+++ b/cmso-optimizer/src/main/docker/extra-files/startService.sh
@@ -1,11 +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} -Dserver.ssl.key-password=${SSL_KEYSTORE_PASSWORD}"
+fi
echo "VM_ARGS="${VM_ARGS}