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: 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 }