From 8ca9a7f168a141f15280662d50d6d4c933dde3bc Mon Sep 17 00:00:00 2001 From: Thomas Nelson Date: Wed, 19 Feb 2020 17:28:11 -0500 Subject: Update startup.sh to use JAVA_OPTS and SPRING_OPTS Issue-ID: MUSIC-561 Signed-off-by: Thomas Nelson Change-Id: I92a342a22df684ddc7ae91832b1e32daab9c5b19 Signed-off-by: Thomas Nelson Change-Id: Ia57db43d217ead0f6d145e775cc9d6264d040274 --- music-rest/distribution/music/startup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/music-rest/distribution/music/startup.sh b/music-rest/distribution/music/startup.sh index 2e1165d1..98b3ae09 100644 --- a/music-rest/distribution/music/startup.sh +++ b/music-rest/distribution/music/startup.sh @@ -57,10 +57,10 @@ fi if [ -f $PROPS ]; then # Run with different Property file #echo "java ${DEBUG_PROP} -jar MUSIC.jar --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE}" - java ${DEBUG_PROP} -jar MUSIC-SB.jar --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE} + java ${DEBUG_PROP} ${JAVA_OPTS} -jar MUSIC-SB.jar ${SPRING_OPTS} --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE} else #echo "java ${DEBUG_PROP} -jar MUSIC.jar --server.ssl.key-store-password=${PASSWORD} ${LOGGING} 2>&1 | tee ${LOGFILE}" - java ${DEBUG_PROP} -jar MUSIC-SB.jar --server.ssl.key-store-password="${PASSWORD}" ${LOGGING} 2>&1 | tee ${LOGFILE} + java ${DEBUG_PROP} ${JAVA_OPTS} -jar MUSIC-SB.jar ${SPRING_OPTS} --server.ssl.key-store-password="${PASSWORD}" ${LOGGING} 2>&1 | tee ${LOGFILE} fi -- cgit 1.2.3-korg