From 77d47eec3d0225315885573f0647f770acb78ff6 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Tue, 24 Sep 2019 12:55:24 +0300
Subject: [PATCH 1/2] Fix #175 (#184)

---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index b170947..0cc4cf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,10 @@ services:
       - AMQP_SERVER_URL=amqp://guest:guest@onlyoffice-rabbitmq
       - REDIS_SERVER_HOST=onlyoffice-redis
       - REDIS_SERVER_PORT=6379
+      # Uncomment strings below to enable the JSON Web Token validation.
+      #- JWT_ENABLED=true
+      #- JWT_SECRET=secret
+      #- JWT_HEADER=Authorization
     stdin_open: true
     restart: always
     networks:

From db01421f8a3a79f2fcdbd55e6662a9f02a7af79c Mon Sep 17 00:00:00 2001
From: Alexey Golubev <Alexey.Golubev@onlyoffice.com>
Date: Wed, 25 Sep 2019 17:49:18 +0300
Subject: [PATCH 2/2] Fix #183

---
 run-document-server.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/run-document-server.sh b/run-document-server.sh
index bebec70..c46c6b0 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -109,6 +109,7 @@ parse_rabbitmq_url(){
   # extract the path (if any)
   local path="$(echo $url | grep / | cut -d/ -f2-)"
 
+  AMQP_SERVER_PROTO=${proto:0:-3}
   AMQP_SERVER_HOST=$host
   AMQP_SERVER_USER=$user
   AMQP_SERVER_PASS=$pass
@@ -176,6 +177,15 @@ update_rabbitmq_setting(){
     else
       ${JSON} -I -e "delete this.activemq.connectOptions.password"
     fi
+
+    case "${AMQP_SERVER_PROTO}" in
+      amqp+ssl|amqps)
+        ${JSON} -I -e "this.activemq.connectOptions.transport = 'tls'"
+        ;;
+      *)
+        ${JSON} -I -e "delete this.activemq.connectOptions.transport"
+        ;;
+    esac 
   fi
 }