summaryrefslogtreecommitdiffstats
path: root/rulemgt-standalone
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2021-03-25 19:47:46 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2021-03-25 19:55:24 +0800
commit09da4ec1f7a52fa293370304ef491aa88025f4df (patch)
treeb44de463f04a4260cb3f1bbf72b1e4840d4e62ce /rulemgt-standalone
parent50116267136cc62ac1cc58dc112c89dea3553638 (diff)
Replace the UI Certs1.3.2
Change-Id: I4012f7f500e37773c1b00516a6495c224789a47e Issue-ID: HOLMES-428 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'rulemgt-standalone')
-rw-r--r--rulemgt-standalone/pom.xml2
-rw-r--r--rulemgt-standalone/src/main/assembly/bin/initDB.sh4
-rw-r--r--rulemgt-standalone/src/main/assembly/bin/run.sh4
3 files changed, 7 insertions, 3 deletions
diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 6a96cad..d8c3720 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</parent>
<artifactId>holmes-rulemgt-standalone</artifactId>
diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
index 88c2022..3da96e9 100644
--- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
@@ -45,8 +45,8 @@ if [ -z `env | grep PGPASSWORD` ]; then
need_unset=1
fi
-psql -U "$user" -p "$port" -h "$host" -d "$dbname" -f $main_path/dbscripts/postgresql/onap-holmes_rulemgt-createobj.sql
-psql -U "$user" -p "$port" -h "$host" -d "$dbname" --command 'select * from aplus_rule;'
+psql -U "'$user'" -p "'$port'" -h "'$host'" -d "'$dbname'" -f $main_path/dbscripts/postgresql/onap-holmes_rulemgt-createobj.sql
+psql -U "'$user'" -p "'$port'" -h "'$host'" -d "'$dbname'" --command 'select * from aplus_rule;'
sql_result=$?
if [ "$need_unset"x == "1"x ]; then
diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index 6594eaf..b710217 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -118,6 +118,10 @@ ${RUNHOME}/initDB.sh "$JDBC_USERNAME" "$JDBC_PASSWORD" "$DB_NAME" "$DB_PORT" "${
#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
if [ ${ENABLE_ENCRYPT} = true ]; then
nginx -c /etc/nginx/conf.d/nginx-https.conf