Merge "Update container startup for SSL"

5 files changed, 65 insertions, 16 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}
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
diff --git a/cmso-ticketmgt/src/main/docker/extra-files/startService.sh b/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
index d040bd9..7cbed3d 100644
--- a/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
+++ b/cmso-ticketmgt/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-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}