diff options
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | rulemgt-frontend/pom.xml | 2 | ||||
| -rw-r--r-- | rulemgt-standalone/pom.xml | 2 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/initDB.sh | 4 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/run.sh | 4 | ||||
| -rw-r--r-- | rulemgt/pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
7 files changed, 11 insertions, 7 deletions
@@ -25,7 +25,7 @@ <groupId>org.onap.holmes.rule-management</groupId> <artifactId>holmes-rulemgt-parent</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>holmes-rule-management</name> <modules> diff --git a/rulemgt-frontend/pom.xml b/rulemgt-frontend/pom.xml index 98d6473..acf65b2 100644 --- a/rulemgt-frontend/pom.xml +++ b/rulemgt-frontend/pom.xml @@ -24,7 +24,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-frontend</artifactId> 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 diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml index 6d9fc2e..facac64 100644 --- a/rulemgt/pom.xml +++ b/rulemgt/pom.xml @@ -20,7 +20,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</artifactId> diff --git a/version.properties b/version.properties index 9ffdb5b..8b2aa75 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1
minor=3
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
|