From 3151df6463e77aba7f0234a1604b2839450bbc3f Mon Sep 17 00:00:00 2001
From: GuangrongFu <fu.guangrong@zte.com.cn>
Date: Wed, 1 Jul 2020 08:49:18 +0800
Subject: Changed the Base Image to onap/integration-java11:7.0.0

Change-Id: I0e71d0250c4d1f37d907bf2d1931b3ec8edce44f
Issue-ID: HOLMES-326
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
---
 rulemgt-standalone/src/main/assembly/bin/run.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'rulemgt-standalone/src/main/assembly/bin')

diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index c9c1e65..fbc7e21 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -27,7 +27,7 @@ main_path=$RUNHOME/..
 cd $main_path
 JAVA_OPTS="-Xms50m -Xmx128m"
 port=9201
-#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n"
+#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=*:$port,server=y,suspend=n"
 echo @JAVA_OPTS@ $JAVA_OPTS
 
 class_path="$main_path/lib/*"
@@ -56,7 +56,7 @@ sed -i "s|msbServerAddr:.*|msbServerAddr: http://$MSB_ADDR|" "$main_path/conf/ru
 export SERVICE_IP=`hostname -i`
 echo SERVICE_IP=${SERVICE_IP}
 
-if [ ! -z ${TESTING} ] && [ ${TESTING} == 1 ]; then
+if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
     if [ ! -z ${HOST_IP} ]; then
         export HOSTNAME=${HOST_IP}:9101
     else
@@ -65,7 +65,7 @@ if [ ! -z ${TESTING} ] && [ ${TESTING} == 1 ]; then
 fi
 
 export DB_PORT=5432
-if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then
+if [ ! -z ${URL_JDBC}  -a `expr index $URL_JDBC :` != 0 ]; then
     export DB_PORT="${URL_JDBC##*:}"
 fi
 echo DB_PORT=$DB_PORT
@@ -73,7 +73,7 @@ echo DB_PORT=$DB_PORT
 if [ -z ${ENABLE_ENCRYPT} ]; then
     export ENABLE_ENCRYPT=true
 fi
-echo ENABLE_ENCRYPT=$ENABLE_ENCRYPT
+echo ENABLE_ENCRYPT=${ENABLE_ENCRYPT}
 
 KEY_PATH="$main_path/conf/holmes.keystore"
 KEY_PASSWORD="holmes"
@@ -81,7 +81,7 @@ KEY_PASSWORD="holmes"
 sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/rulemgt.yml"
 sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/rulemgt.yml"
 
-if [ ${ENABLE_ENCRYPT} == true ]; then
+if [ ${ENABLE_ENCRYPT} = true ]; then
     sed -i "s|type:\s*https\?$|type: https|" "$main_path/conf/rulemgt.yml"
     sed -i "s|#\?keyStorePath|keyStorePath|" "$main_path/conf/rulemgt.yml"
     sed -i "s|#\?keyStorePassword|keyStorePassword|" "$main_path/conf/rulemgt.yml"
@@ -106,10 +106,10 @@ fi
 #echo Registered UI to MSB.
 
 
-if [ ${ENABLE_ENCRYPT} == true ]; then
-    nginx -c /usr/local/openresty/nginx/conf/nginx-https.conf
+if [ ${ENABLE_ENCRYPT} = true ]; then
+    nginx -c /etc/nginx/conf.d/nginx-https.conf
 else
-    nginx -c /usr/local/openresty/nginx/conf/nginx-http.conf
+    nginx -c /etc/nginx/conf.d/nginx-http.conf
 fi
 echo nginx started.
 
-- 
cgit 1.2.3-korg