aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-04-10 09:08:25 -0400
committerJerry Flood <jflood@att.com>2019-04-10 09:08:48 -0400
commit9c23f5162c9cde34e69f0caa49ae154aeec9ec83 (patch)
tree963d1922ae69635c21eb02c16df6f086e18b7ad6
parenta5e82a2a703fd31cac33cef4bbe07445a274ba71 (diff)
Add java truststore to startup
Issue-ID: OPTFRA-391 Change-Id: I0a2dd62d0dcc4f8ddc714eae6a50b29f0f737b0b Signed-off-by: Jerry Flood <jflood@att.com>
-rw-r--r--cmso-optimizer/src/main/docker/extra-files/startService.sh7
-rw-r--r--cmso-service/src/main/docker/extra-files/startService.sh6
-rw-r--r--cmso-ticketmgt/src/main/docker/extra-files/startService.sh6
-rw-r--r--cmso-topology/src/main/docker/extra-files/startService.sh7
4 files changed, 22 insertions, 4 deletions
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}