Add the ability to set the amqps protocol

install/OneClickInstall/install-Docker.sh

@@ -87,6 +87,7 @@ REDIS_PORT=""
 REDIS_USER_NAME=""
 REDIS_PASSWORD=""
 
+RABBIT_PROTOCOL=""
 RABBIT_HOST=""
 RABBIT_PORT=""
 RABBIT_USER_NAME=""
@@ -409,6 +410,13 @@ while [ "$1" != "" ]; do
 			fi
 		;;
 
+		-rbpr | --rabbitmqprotocol )
+			if [ "$2" != "" ]; then
+				RABBIT_PROTOCOL=$2
+				shift
+			fi
+		;;
+
 		-rbth | --rabbitmqhost )
 			if [ "$2" != "" ]; then
 				RABBIT_HOST=$2
@@ -1410,6 +1418,7 @@ services_check_connection () {
 	}
 	[[ ! -z "$RABBIT_HOST" ]] && {
 		establish_conn ${RABBIT_HOST} "${RABBIT_PORT:-5672}" "RabbitMQ"
+		reconfigure RABBIT_PROTOCOL ${RABBIT_PROTOCOL:-amqp}
 		reconfigure RABBIT_HOST ${RABBIT_HOST}
 		reconfigure RABBIT_PORT "${RABBIT_PORT:-5672}"
 		reconfigure RABBIT_USER_NAME ${RABBIT_USER_NAME}

install/docker/.env

@@ -75,6 +75,7 @@
 
 # rabbitmq # 
     RABBIT_CONTAINER_NAME=${CONTAINER_PREFIX}rabbitmq
+    RABBIT_PROTOCOL=""
     RABBIT_HOST=""
     RABBIT_PORT=5672
     RABBIT_VIRTUAL_HOST=/

install/docker/docker-entrypoint.py

@@ -69,13 +69,18 @@ REDIS_PASSWORD = {"Password": os.environ["REDIS_PASSWORD"]} if environ.get("REDI
 REDIS_CONNECTION_HOST = REDIS_HOST if REDIS_HOST else REDIS_CONTAINER_NAME
 
 RABBIT_CONTAINER_NAME = os.environ["RABBIT_CONTAINER_NAME"] if environ.get("RABBIT_CONTAINER_NAME") else "onlyoffice-rabbitmq"
+RABBIT_PROTOCOL = os.environ["RABBIT_PROTOCOL"] if environ.get("RABBIT_PROTOCOL") else "amqp"
 RABBIT_HOST = os.environ["RABBIT_HOST"] if environ.get("RABBIT_HOST") else None
 RABBIT_USER_NAME = os.environ["RABBIT_USER_NAME"] if environ.get("RABBIT_USER_NAME") else "guest"
 RABBIT_PASSWORD = os.environ["RABBIT_PASSWORD"] if environ.get("RABBIT_PASSWORD") else "guest"
 RABBIT_PORT =  os.environ["RABBIT_PORT"] if environ.get("RABBIT_PORT") else "5672"
 RABBIT_VIRTUAL_HOST = os.environ["RABBIT_VIRTUAL_HOST"] if environ.get("RABBIT_VIRTUAL_HOST") else "/"
-RABBIT_URI = {"Uri": os.environ["RABBIT_URI"]} if environ.get("RABBIT_URI") else None
 RABBIT_CONNECTION_HOST = RABBIT_HOST if RABBIT_HOST else RABBIT_CONTAINER_NAME
+RABBIT_URI = (
+    {"Uri": os.environ["RABBIT_URI"]} if os.environ.get("RABBIT_URI")
+    else {"Uri": f"{RABBIT_PROTOCOL}://{RABBIT_USER_NAME}:{RABBIT_PASSWORD}@{RABBIT_HOST}:{RABBIT_PORT}{RABBIT_VIRTUAL_HOST}"}
+    if RABBIT_PROTOCOL == "amqps" and RABBIT_HOST else None
+)
 
 class RunServices:
     def __init__(self, SERVICE_PORT, PATH_TO_CONF):

install/docker/docspace.profiles.yml

@@ -45,6 +45,7 @@ x-service: &x-service-base
     ELK_HOST: ${ELK_HOST}
     ELK_PORT: ${ELK_PORT}
     REDIS_CONTAINER_NAME: ${REDIS_CONTAINER_NAME}
+    RABBIT_PROTOCOL: ${RABBIT_PROTOCOL}
     REDIS_HOST: ${REDIS_HOST}
     REDIS_PORT: ${REDIS_PORT}
     REDIS_USER_NAME: ${REDIS_USER_NAME}

install/docker/docspace.yml

@@ -42,6 +42,7 @@ x-service: &x-service-base
     REDIS_USER_NAME: ${REDIS_USER_NAME}
     REDIS_PASSWORD: ${REDIS_PASSWORD}
     RABBIT_CONTAINER_NAME: ${RABBIT_CONTAINER_NAME}
+    RABBIT_PROTOCOL: ${RABBIT_PROTOCOL}
     RABBIT_HOST: ${RABBIT_HOST}
     RABBIT_PORT: ${RABBIT_PORT}
     RABBIT_VIRTUAL_HOST: ${RABBIT_VIRTUAL_HOST}

install/docker/notify.yml

@@ -43,6 +43,7 @@ x-service:
       REDIS_USER_NAME: ${REDIS_USER_NAME}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       RABBIT_CONTAINER_NAME: ${RABBIT_CONTAINER_NAME}
+      RABBIT_PROTOCOL: ${RABBIT_PROTOCOL}
       RABBIT_HOST: ${RABBIT_HOST}
       RABBIT_PORT: ${RABBIT_PORT}
       RABBIT_VIRTUAL_HOST: ${RABBIT_VIRTUAL_HOST}