Merge branch hotfix/v6.0.2 into develop

Author: papacarlo

Makefile

@@ -108,6 +108,10 @@ BUILD_DATE := $(shell date +%F-%H-%M)
 WEBAPPS_DIR := web-apps
 SDKJS_DIR :=sdkjs
 
+ifeq ($(PRODUCT_NAME_LOW),$(filter $(PRODUCT_NAME_LOW),documentserver))
+OFFICIAL_PRODUCT_NAME := 'Community Edition'
+endif
+
 ifeq ($(PRODUCT_NAME_LOW),$(filter $(PRODUCT_NAME_LOW),documentserver-ee))
 OFFICIAL_PRODUCT_NAME := 'Enterprise Edition'
 endif
@@ -440,7 +444,7 @@ exe/$(PACKAGE_NAME).iss : exe/package.iss
 		--define '_ds_prefix $(DS_PREFIX)' \
 		$(PACKAGE_NAME).spec
 
-ifeq ($(PACKAGE_NAME),$(filter $(PACKAGE_NAME),onlyoffice-documentserver-ee onlyoffice-documentserver-de onlyoffice-documentserver-ie))
+ifeq ($(COMPANY_NAME_LOW),onlyoffice)
 M4_PARAMS += -D M4_DS_EXAMPLE_ENABLE=1
 endif
 

apt-rpm/bin/documentserver-configure.sh.m4

@@ -72,6 +72,7 @@ save_db_params(){
 save_rabbitmq_params(){
 	$JSON -e "if(this.queue===undefined)this.queue={};"
 	$JSON -e "this.queue.type = 'rabbitmq'"
+	$JSON -e "if(this.rabbitmq===undefined)this.rabbitmq={};"
 	$JSON -e "this.rabbitmq.url = '${AMQP_SERVER_URL}'"
 }
 
@@ -244,7 +245,7 @@ execute_postgres_scripts(){
                 $CREATEDB $DB_NAME >/dev/null 2>&1
         fi
 
-        if [ ! "$CLUSTER_MODE" == true ]; then
+        if [ ! "$CLUSTER_MODE" = true ]; then
                 $PSQL -d "$DB_NAME" -f "$DIR/server/schema/postgresql/removetbl.sql" >/dev/null 2>&1
         fi
 

deb/debian/postinst.m4

@@ -126,7 +126,7 @@ install_postges() {
 		if ! $PSQL -lt | cut -d\| -f 1 | grep -qw $DB_NAME; then
 			$CREATEDB $DB_NAME >/dev/null 2>&1
 		fi
-		if [ ! $CLUSTER_MODE == true ]; then
+		if [ ! $CLUSTER_MODE = true ]; then
 			$PSQL -d $DB_NAME -f "$DIR/server/schema/postgresql/removetbl.sql" \
 				>/dev/null 2>&1
 		fi

rpm/bin/documentserver-configure.sh.m4

@@ -224,7 +224,7 @@ execute_postgres_scripts(){
                 $CREATEDB $DB_NAME >/dev/null 2>&1
         fi
 
-        if [ ! "$CLUSTER_MODE" == true ]; then
+        if [ ! "$CLUSTER_MODE" = true ]; then
                 $PSQL -d "$DB_NAME" -f "$DIR/server/schema/postgresql/removetbl.sql" >/dev/null 2>&1
         fi