jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v5.4.1

Browse Source
This commit is contained in:
Alexey Golubev 2019-10-02 12:07:22 +03:00
commit b590340a10
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

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

10
run-document-server.sh
View File

@ -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(){
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
} }