From: Jerry Flood <jflood@att.com>
Date: Wed, 10 Apr 2019 13:08:25 +0000 (-0400)
Subject: Add java truststore to startup
X-Git-Tag: 2.0.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F84878%2F1;p=optf%2Fcmso.git

Add java truststore to startup

Issue-ID: OPTFRA-391

Change-Id: I0a2dd62d0dcc4f8ddc714eae6a50b29f0f737b0b
Signed-off-by: Jerry Flood <jflood@att.com>
---

diff --git a/cmso-optimizer/src/main/docker/extra-files/startService.sh b/cmso-optimizer/src/main/docker/extra-files/startService.sh
index 199c637..6efd912 100644
--- a/cmso-optimizer/src/main/docker/extra-files/startService.sh
+++ b/cmso-optimizer/src/main/docker/extra-files/startService.sh
@@ -1,7 +1,12 @@
 #!/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}"
+
 
 echo "VM_ARGS="${VM_ARGS}
 
-java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar
+java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar --spring.profiles.active=${AUTHENTICATION}
diff --git a/cmso-service/src/main/docker/extra-files/startService.sh b/cmso-service/src/main/docker/extra-files/startService.sh
index 199c637..d040bd9 100644
--- a/cmso-service/src/main/docker/extra-files/startService.sh
+++ b/cmso-service/src/main/docker/extra-files/startService.sh
@@ -1,7 +1,11 @@
 #!/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}"
 
 echo "VM_ARGS="${VM_ARGS}
 
-java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar
+java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar --spring.profiles.active=${AUTHENTICATION}
diff --git a/cmso-ticketmgt/src/main/docker/extra-files/startService.sh b/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
index 199c637..d040bd9 100644
--- a/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
+++ b/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
@@ -1,7 +1,11 @@
 #!/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}"
 
 echo "VM_ARGS="${VM_ARGS}
 
-java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar
+java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar --spring.profiles.active=${AUTHENTICATION}
diff --git a/cmso-topology/src/main/docker/extra-files/startService.sh b/cmso-topology/src/main/docker/extra-files/startService.sh
index 199c637..6efd912 100644
--- a/cmso-topology/src/main/docker/extra-files/startService.sh
+++ b/cmso-topology/src/main/docker/extra-files/startService.sh
@@ -1,7 +1,12 @@
 #!/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}"
+
 
 echo "VM_ARGS="${VM_ARGS}
 
-java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar
+java -Djava.security.egd=file:/dev/./urandom  ${VM_ARGS} -Xms256m -Xmx1024m  -jar  ./app.jar --spring.profiles.active=${AUTHENTICATION}