From 17e160784612a0faa782eb7069be91532b4dfabc Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
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 <jflood@att.com>
---
 .../src/main/docker/extra-files/startService.sh     | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'cmso-topology')

diff --git a/cmso-topology/src/main/docker/extra-files/startService.sh b/cmso-topology/src/main/docker/extra-files/startService.sh
index 6efd912..7cbed3d 100644
--- a/cmso-topology/src/main/docker/extra-files/startService.sh
+++ b/cmso-topology/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} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}"
+fi
 
 echo "VM_ARGS="${VM_ARGS}
 
-- 
cgit 1.2.3-korg