Skip to content
Snippets Groups Projects
Commit c2b61879 authored by Alexey Golubev's avatar Alexey Golubev
Browse files

v5.4.1

parents ba14b959 db01421f
Branches
No related tags found
No related merge requests found
Pipeline #14 failed
...@@ -12,6 +12,10 @@ services: ...@@ -12,6 +12,10 @@ services:
- AMQP_SERVER_URL=amqp://guest:guest@onlyoffice-rabbitmq - AMQP_SERVER_URL=amqp://guest:guest@onlyoffice-rabbitmq
- REDIS_SERVER_HOST=onlyoffice-redis - REDIS_SERVER_HOST=onlyoffice-redis
- REDIS_SERVER_PORT=6379 - 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 stdin_open: true
restart: always restart: always
networks: networks:
......
...@@ -109,6 +109,7 @@ parse_rabbitmq_url(){ ...@@ -109,6 +109,7 @@ parse_rabbitmq_url(){
# extract the path (if any) # extract the path (if any)
local path="$(echo $url | grep / | cut -d/ -f2-)" local path="$(echo $url | grep / | cut -d/ -f2-)"
AMQP_SERVER_PROTO=${proto:0:-3}
AMQP_SERVER_HOST=$host AMQP_SERVER_HOST=$host
AMQP_SERVER_USER=$user AMQP_SERVER_USER=$user
AMQP_SERVER_PASS=$pass AMQP_SERVER_PASS=$pass
...@@ -176,6 +177,15 @@ update_rabbitmq_setting(){ ...@@ -176,6 +177,15 @@ update_rabbitmq_setting(){
else else
${JSON} -I -e "delete this.activemq.connectOptions.password" ${JSON} -I -e "delete this.activemq.connectOptions.password"
fi 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 fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment