From be3f76835821e85c8cd1e6f30b9f5e73adf3955f Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Fri, 9 Dec 2016 15:50:07 +0300 Subject: [PATCH] Changed rabbitmq settings --- README.md | 4 +--- docker-compose.yml | 4 +--- run-document-server.sh | 53 +++++++++++++++++++++++++++++++++++------- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d367c2b..62b34af 100644 --- a/README.md +++ b/README.md @@ -153,9 +153,7 @@ Below is the complete list of parameters that can be set using environment varia - **POSTGRESQL_SERVER_DB_NAME**: The name of a PostgreSQL database to be created on the image startup. - **POSTGRESQL_SERVER_USER**: The new user name with superuser permissions for the PostgreSQL account. - **POSTGRESQL_SERVER_PASS**: The password set for the PostgreSQL account. -- **RABBITMQ_SERVER_HOST**: The IP address or the name of the host where the RabbitMQ server is running. -- **RABBITMQ_SERVER_USER**: The RabbitMQ server user name. -- **RABBITMQ_SERVER_PASS**: The password set for the RabbitMQ account. +- **RABBITMQ_SERVER_URL**: The [AMQP URL](http://www.rabbitmq.com/uri-spec.html "RabbitMQ URI Specification") to connect to RabbitMQ server. - **REDIS_SERVER_HOST**: The IP address or the name of the host where the Redis server is running. - **REDIS_SERVER_PORT**: The Redis server port number. diff --git a/docker-compose.yml b/docker-compose.yml index 3a86dff..dadc486 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,7 @@ services: - POSTGRESQL_SERVER_PORT=5432 - POSTGRESQL_SERVER_DB_NAME=onlyoffice - POSTGRESQL_SERVER_USER=onlyoffice - - RABBITMQ_SERVER_HOST=onlyoffice-rabbitmq - - RABBITMQ_SERVER_USER=guest - - RABBITMQ_SERVER_PASS=guest + - RABBITMQ_SERVER_URL=amqp://guest:guest@onlyoffice-rabbitmq - REDIS_SERVER_HOST=onlyoffice-redis - REDIS_SERVER_PORT=6379 stdin_open: true diff --git a/run-document-server.sh b/run-document-server.sh index 6f2d058..e573031 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -37,16 +37,55 @@ read_setting(){ POSTGRESQL_SERVER_USER=${POSTGRESQL_SERVER_USER:-$(${JSON} services.CoAuthoring.sql.dbUser)} POSTGRESQL_SERVER_PASS=${POSTGRESQL_SERVER_PASS:-$(${JSON} services.CoAuthoring.sql.dbPass)} - RABBITMQ_SERVER_URL=$(${JSON} rabbitmq.url) - RABBITMQ_SERVER_HOST=${RABBITMQ_SERVER_HOST:-${RABBITMQ_SERVER_URL#'amqp://'}} - RABBITMQ_SERVER_USER=${RABBITMQ_SERVER_USER:-$(${JSON} rabbitmq.login)} - RABBITMQ_SERVER_PASS=${RABBITMQ_SERVER_PASS:-$(${JSON} rabbitmq.password)} - RABBITMQ_SERVER_PORT=${RABBITMQ_SERVER_PORT:-"5672"} + RABBITMQ_SERVER_URL=${RABBITMQ_SERVER_URL:-$(${JSON} rabbitmq.url)} + parse_rabbitmq_url REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-$(${JSON} services.CoAuthoring.redis.host)} REDIS_SERVER_PORT=${REDIS_SERVER_PORT:-$(${JSON} services.CoAuthoring.redis.port)} } +parse_rabbitmq_url(){ + local amqp=${RABBITMQ_SERVER_URL} + + # extract the protocol + local proto="$(echo $amqp | grep :// | sed -e's,^\(.*://\).*,\1,g')" + # remove the protocol + local url="$(echo ${amqp/$proto/})" + + # extract the user and password (if any) + local userpass="`echo $url | grep @ | cut -d@ -f1`" + local pass=`echo $userpass | grep : | cut -d: -f2` + + local user + if [ -n "$pass" ]; then + user=`echo $userpass | grep : | cut -d: -f1` + else + user=$userpass + fi + echo $user + + # extract the host + local hostport="$(echo ${url/$userpass@/} | cut -d/ -f1)" + # by request - try to extract the port + local port="$(echo $hostport | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g')" + + local host + if [ -n "$port" ]; then + host=`echo $hostport | grep : | cut -d: -f1` + else + host=$hostport + port="5672" + fi + + # extract the path (if any) + local path="$(echo $url | grep / | cut -d/ -f2-)" + + RABBITMQ_SERVER_HOST=$host + RABBITMQ_SERVER_USER=$user + RABBITMQ_SERVER_PASS=$pass + RABBITMQ_SERVER_PORT=$port +} + waiting_for_connection(){ until nc -z -w 3 "$1" "$2"; do >&2 echo "Waiting for connection to the $1 host on port $2" @@ -77,9 +116,7 @@ update_postgresql_settings(){ } update_rabbitmq_setting(){ - ${JSON} -I -e "this.rabbitmq.url = 'amqp://${RABBITMQ_SERVER_HOST}'" - ${JSON} -I -e "this.rabbitmq.login = '${RABBITMQ_SERVER_USER}'" - ${JSON} -I -e "this.rabbitmq.password = '${RABBITMQ_SERVER_PASS}'" + ${JSON} -I -e "this.rabbitmq.url = '${RABBITMQ_SERVER_URL}'" } update_redis_settings(){