X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fsrc%2Fmain%2Fassembly%2Fbin%2Frun.sh;h=ffbdc7e47f4388aba405e36bc770751542a68491;hb=6f0d10beffc66f5e44f91538b3cd396cce5f8c84;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..ffbdc7e 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"
@@ -57,10 +57,10 @@ else
     sed -i "s|url:.*|url: jdbc:postgresql://$URL_JDBC/$DB_NAME|" "$main_path/conf/rulemgt.yml"
 fi
 
-export SERVICE_IP=`hostname -i`
+export SERVICE_IP=`hostname -i | awk '{print $1}'`
 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"
@@ -103,12 +112,19 @@ fi
 ${RUNHOME}/initDB.sh "$JDBC_USERNAME" "$JDBC_PASSWORD" "$DB_NAME" "$DB_PORT" "${URL_JDBC%:*}"
 
 
-#Register the fronten to MSB
+#Register the frontend to MSB
 #body='{"serviceName":"holmes","version":"v1","url":"/iui/holmes","nodes":[{"ip":"host_ip","port":"9104","lb_server_params":"","checkType":"","checkUrl":"","checkInterval":"","checkTimeOut":"","ttl":"","ha_role":""}],"protocol":"UI","visualRange":"0|1","lb_policy":"","publish_port":"","namespace":"","network_plane_type":"","host":"","path":"","labels":[],"metadata":[]}'
 #msg_body=${body/host_ip/"${HOSTNAME%:*}"}
 #curl -X POST -H "Content-Type: application/json" -d ${msg_body} http://${MSB_ADDR}/api/msdiscover/v1/services?is_manual=true
 #echo Registered UI to MSB.
 
+if [ -f "/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.crt" ]; then
+    sed -i "s|/etc/ssl/certs/holmes-frontend-selfsigned.crt|/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.crt|" "/etc/nginx/conf.d/nginx-https.conf"
+    sed -i "s|/etc/ssl/private/holmes-frontend.key|/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.key|" "/etc/nginx/conf.d/nginx-https.conf"
+fi
+
+
+sed -i "s|msb-iag.onap|$MSB_ADDR|g" /etc/nginx/conf.d/nginx-http*.conf
 
 if [ ${ENABLE_ENCRYPT} = true ]; then
     nginx -c /etc/nginx/conf.d/nginx-https.conf