From 1fe33f849f3aa6f27a87c2e35bddb49376bd16f7 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 5 Mar 2019 18:12:54 +0300 Subject: [PATCH 1/6] Rename AMQP_SERVER_ENGINE->AMQP_SERVER_TYPE --- README.md | 2 +- activemq.yml | 2 +- run-document-server.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 524ca68..df1eb84 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ Below is the complete list of parameters that can be set using environment varia - **POSTGRESQL_SERVER_USER**: The new user name with superuser permissions for the PostgreSQL account. - **POSTGRESQL_SERVER_PASS**: The password set for the PostgreSQL account. - **AMQP_SERVER_URL**: The [AMQP URL](http://www.rabbitmq.com/uri-spec.html "RabbitMQ URI Specification") to connect to message broker server. -- **AMQP_SERVER_ENGINE**: The message broker engine. Supported values are 'rabbitmq' or 'activemq'. Defaults to 'rabbitmq'. +- **AMQP_SERVER_TYPE**: The message broker engine. Supported values are 'rabbitmq' or 'activemq'. Defaults to 'rabbitmq'. - **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. - **NGINX_WORKER_PROCESSES**: Defines the number of nginx worker processes. diff --git a/activemq.yml b/activemq.yml index 4f39e77..f6a5fed 100644 --- a/activemq.yml +++ b/activemq.yml @@ -5,7 +5,7 @@ services: image: onlyoffice/4testing-documentserver-ie:latest environment: - AMQP_SERVER_URL=amqp://guest:guest@onlyoffice-activemq - - AMQP_SERVER_ENGINE=activemq + - AMQP_SERVER_TYPE=activemq stdin_open: true restart: always ports: diff --git a/run-document-server.sh b/run-document-server.sh index 11aa8f4..82f1b85 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -64,7 +64,7 @@ read_setting(){ RABBITMQ_SERVER_URL=${RABBITMQ_SERVER_URL:-$(${JSON} rabbitmq.url)} AMQP_SERVER_URL=${AMQP_SERVER_URL:-${RABBITMQ_SERVER_URL}} - AMQP_SERVER_ENGINE=${AMQP_SERVER_ENGINE:-rabbitmq} + AMQP_SERVER_TYPE=${AMQP_SERVER_TYPE:-rabbitmq} parse_rabbitmq_url ${AMQP_SERVER_URL} REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-$(${JSON} services.CoAuthoring.redis.host)} @@ -144,12 +144,12 @@ update_postgresql_settings(){ } update_rabbitmq_setting(){ - if [ "${AMQP_SERVER_ENGINE}" == "rabbitmq" ]; then + if [ "${AMQP_SERVER_TYPE}" == "rabbitmq" ]; then ${JSON} -I -e "this.rabbitmq.url = '${RABBITMQ_SERVER_URL}'" sed 's/\(exports\.USE_RABBIT_MQ = \).*\(;\)/'"\1true\2"'/' -i ${APP_DIR}/server/Common/sources/constants.js fi - if [ "${AMQP_SERVER_ENGINE}" == "activemq" ]; then + if [ "${AMQP_SERVER_TYPE}" == "activemq" ]; then ${JSON} -I -e "if(this.activemq===undefined)this.activemq={};" ${JSON} -I -e "if(this.activemq.connectOptions===undefined)this.activemq.connectOptions={};" From c22686d264d9e5c8564f42f1f3b3c3b2715ff474 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 5 Mar 2019 18:14:50 +0300 Subject: [PATCH 2/6] Cosmetic --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df1eb84..e438d83 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ Below is the complete list of parameters that can be set using environment varia - **POSTGRESQL_SERVER_USER**: The new user name with superuser permissions for the PostgreSQL account. - **POSTGRESQL_SERVER_PASS**: The password set for the PostgreSQL account. - **AMQP_SERVER_URL**: The [AMQP URL](http://www.rabbitmq.com/uri-spec.html "RabbitMQ URI Specification") to connect to message broker server. -- **AMQP_SERVER_TYPE**: The message broker engine. Supported values are 'rabbitmq' or 'activemq'. Defaults to 'rabbitmq'. +- **AMQP_SERVER_TYPE**: The message broker type. Supported values are `rabbitmq` or `activemq`. Defaults to `rabbitmq`. - **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. - **NGINX_WORKER_PROCESSES**: Defines the number of nginx worker processes. From 2a96d3c5f0c5dd4346d085229e1d7b803aea9456 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 6 Mar 2019 12:30:54 +0300 Subject: [PATCH 3/6] Change setup amqp server type --- run-document-server.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/run-document-server.sh b/run-document-server.sh index 82f1b85..da091d9 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -145,11 +145,12 @@ update_postgresql_settings(){ update_rabbitmq_setting(){ if [ "${AMQP_SERVER_TYPE}" == "rabbitmq" ]; then + ${JSON} -I -e "this.queue.type = 'rabbitmq'" ${JSON} -I -e "this.rabbitmq.url = '${RABBITMQ_SERVER_URL}'" - sed 's/\(exports\.USE_RABBIT_MQ = \).*\(;\)/'"\1true\2"'/' -i ${APP_DIR}/server/Common/sources/constants.js fi if [ "${AMQP_SERVER_TYPE}" == "activemq" ]; then + ${JSON} -I -e "this.queue.type = 'activemq'" ${JSON} -I -e "if(this.activemq===undefined)this.activemq={};" ${JSON} -I -e "if(this.activemq.connectOptions===undefined)this.activemq.connectOptions={};" @@ -172,8 +173,6 @@ update_rabbitmq_setting(){ else ${JSON} -I -e "delete this.activemq.connectOptions.password" fi - - sed 's/\(exports\.USE_RABBIT_MQ = \).*\(;\)/'"\1false\2"'/' -i ${APP_DIR}/server/Common/sources/constants.js fi } From b47a70582a5444b971dbb7d5932b695f86162bd3 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Thu, 7 Mar 2019 15:21:52 +0300 Subject: [PATCH 4/6] Fix setup amqp type --- run-document-server.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run-document-server.sh b/run-document-server.sh index da091d9..008de7b 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -145,11 +145,13 @@ update_postgresql_settings(){ update_rabbitmq_setting(){ if [ "${AMQP_SERVER_TYPE}" == "rabbitmq" ]; then + ${JSON} -I -e "if(this.queue===undefined)this.queue={};" ${JSON} -I -e "this.queue.type = 'rabbitmq'" ${JSON} -I -e "this.rabbitmq.url = '${RABBITMQ_SERVER_URL}'" fi if [ "${AMQP_SERVER_TYPE}" == "activemq" ]; then + ${JSON} -I -e "if(this.queue===undefined)this.queue={};" ${JSON} -I -e "this.queue.type = 'activemq'" ${JSON} -I -e "if(this.activemq===undefined)this.activemq={};" ${JSON} -I -e "if(this.activemq.connectOptions===undefined)this.activemq.connectOptions={};" From 5031b7f983117e057af9b9371c4700ebf1185bb8 Mon Sep 17 00:00:00 2001 From: hellonadya Date: Wed, 15 May 2019 17:49:10 +0300 Subject: [PATCH 5/6] Update Readme.md - UTMs added to website links in Project information - Link to solutions comparison added to Project information --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e438d83..c921efb 100644 --- a/README.md +++ b/README.md @@ -295,7 +295,7 @@ Please note, that both executing the script and disconnecting users may take a l ## Project Information -Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org") +Official website: [https://www.onlyoffice.com](https://www.onlyoffice.com/?utm_source=github&utm_medium=cpc&utm_campaign=GitHubDockerDS) Code repository: [https://github.com/ONLYOFFICE/DocumentServer](https://github.com/ONLYOFFICE/DocumentServer "https://github.com/ONLYOFFICE/DocumentServer") @@ -303,7 +303,9 @@ Docker Image: [https://github.com/ONLYOFFICE/Docker-DocumentServer](https://gith License: [GNU AGPL v3.0](https://help.onlyoffice.com/products/files/doceditor.aspx?fileid=4358397&doc=K0ZUdlVuQzQ0RFhhMzhZRVN4ZFIvaHlhUjN2eS9XMXpKR1M5WEppUk1Gcz0_IjQzNTgzOTci0 "GNU AGPL v3.0") -SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com") +Free version vs commercial builds comparison: https://github.com/ONLYOFFICE/DocumentServer#onlyoffice-document-server-editions + +SaaS version: [https://www.onlyoffice.com/cloud-office.aspx](https://www.onlyoffice.com/cloud-office.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubDockerDS) ## User Feedback and Support From 2d6a4e0908612dfabbdc0488c22eea6e7cfd244b Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 21 May 2019 16:06:58 +0300 Subject: [PATCH 6/6] Fix crash on system without ipv6 --- run-document-server.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run-document-server.sh b/run-document-server.sh index 008de7b..29ea5be 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -277,6 +277,11 @@ update_nginx_settings(){ ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF} fi + # check if ipv6 supported otherwise remove it from nginx config + if [ ! -f /proc/net/if_inet6 ]; then + sed '/listen\s\+\[::[0-9]*\].\+/d' -i $NGINX_ONLYOFFICE_CONF + fi + if [ -f "${NGINX_ONLYOFFICE_EXAMPLE_CONF}" ]; then sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF} fi