X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fsrc%2Fmain%2Fassembly%2Fbin%2Frun.sh;h=6594eaf3f47909abdb6713110ae91f3233bd6737;hb=161284df434fdff3264e1c41b9d179e971560a65;hp=3e0ff974dc861b928ec5a219c55884728e87407f;hpb=bf43529b242519e3c8c690820bba8dd4e8831d8a;p=holmes%2Frule-management.git

diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index 3e0ff97..6594eaf 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -49,7 +49,7 @@ if [ -z ${DB_NAME} ]; then
 fi
 
 # if deployed using helm, use the helm-generated configuration file.
-if [[ -d /opt/hrmconfig ]]; then
+if [ -d /opt/hrmconfig ]; then
     cp /opt/hrmconfig/rulemgt.yml "$main_path/conf/rulemgt.yml"
 else
     sed -i "s|user:.*|user: $JDBC_USERNAME|" "$main_path/conf/rulemgt.yml"
@@ -60,7 +60,7 @@ fi
 export SERVICE_IP=`hostname -i`
 echo SERVICE_IP=${SERVICE_IP}
 
-if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
+if [ ! -z ${TESTING} ] && [ ${TESTING} = 1 ]; then
     if [ ! -z ${HOST_IP} ]; then
         export HOSTNAME=${HOST_IP}:9101
     else
@@ -69,7 +69,7 @@ if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
 fi
 
 export DB_PORT=5432
-if [ ! -z ${URL_JDBC}  -a `expr index $URL_JDBC :` != 0 ]; then
+if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then
     export DB_PORT="${URL_JDBC##*:}"
 fi
 echo DB_PORT=$DB_PORT
@@ -81,6 +81,15 @@ echo ENABLE_ENCRYPT=${ENABLE_ENCRYPT}
 
 KEY_PATH="$main_path/conf/holmes.keystore"
 KEY_PASSWORD="holmes"
+
+if [ -f "/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.p12" ]; then
+    KEY_PATH="/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.p12"
+    KEY_PASSWORD=`head -n1 "/opt/app/osaaf/local/mycreds.prop" | cut -d= -f2`
+fi
+
+echo "KEY_PATH=$KEY_PATH"
+echo "KEY_PASS=$KEY_PASSWORD"
+
 #HTTPS Configurations
 sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/rulemgt.yml"
 sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/rulemgt.yml"