From 1ff3e1def621ddf234479ba9752681afbbf084c0 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Fri, 2 Nov 2018 11:53:06 +0300
Subject: [PATCH 1/4] Fix #133

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index dadc486..044093a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
     networks:
       - onlyoffice
     volumes:
+       - /etc/onlyoffice
        - /var/www/onlyoffice/Data
        - /var/log/onlyoffice
        - /var/lib/onlyoffice/documentserver/App_Data/cache/files

From e430c76d51342a7c5b2c8dec644f8c676e07168d Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Tue, 6 Nov 2018 17:16:29 +0300
Subject: [PATCH 2/4] Fix #134

---
 run-document-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run-document-server.sh b/run-document-server.sh
index 40a7c27..c31f204 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -198,7 +198,7 @@ create_postgresql_tbl(){
 
   # Create db on remote server
   if $PSQL -lt | cut -d\| -f 1 | grep -qw | grep 0; then
-    $CREATEDB $DB_NAME
+    $CREATEDB $POSTGRESQL_SERVER_DB_NAME
   fi
 
   $PSQL -d "${POSTGRESQL_SERVER_DB_NAME}" -f "${APP_DIR}/server/schema/postgresql/createdb.sql"

From 26f7126cb0f41379f0196d52a52411cfdbb23128 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Thu, 15 Nov 2018 12:11:08 +0300
Subject: [PATCH 3/4] Fix #138

---
 run-document-server.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run-document-server.sh b/run-document-server.sh
index c31f204..38c11b8 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -67,7 +67,7 @@ read_setting(){
   REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-$(${JSON} services.CoAuthoring.redis.host)}
   REDIS_SERVER_PORT=${REDIS_SERVER_PORT:-6379}
 
-  DS_LOG_LEVEL=${DS_LOG_LEVEL:-$(${JSON_LOG} levels.nodeJS)}
+  DS_LOG_LEVEL=${DS_LOG_LEVEL:-$(${JSON_LOG} categories.default.level)}
 }
 
 parse_rabbitmq_url(){
@@ -256,7 +256,7 @@ update_supervisor_settings(){
 }
 
 update_log_settings(){
-   ${JSON_LOG} -I -e "this.levels.nodeJS = '${DS_LOG_LEVEL}'"
+   ${JSON_LOG} -I -e "this.categories.default.level = '${DS_LOG_LEVEL}'"
 }
 
 # create base folders

From 96c37d7312c953cfffeaba8307f6ae4cfabc2701 Mon Sep 17 00:00:00 2001
From: Alexey Golubev <alexey.golubev@onlyoffice.com>
Date: Tue, 20 Nov 2018 17:06:53 +0300
Subject: [PATCH 4/4] Fix log rotation

---
 run-document-server.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/run-document-server.sh b/run-document-server.sh
index 38c11b8..d8585f7 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -259,6 +259,10 @@ update_log_settings(){
    ${JSON_LOG} -I -e "this.categories.default.level = '${DS_LOG_LEVEL}'"
 }
 
+update_logrotate_settings(){
+  sed 's|\(^su\b\).*|\1 root root|' -i /etc/logrotate.conf
+}
+
 # create base folders
 for i in converter docservice spellchecker metrics gc; do
   mkdir -p "${DS_LOG_DIR}/$i"
@@ -341,6 +345,7 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
   service supervisor start
   
   # start cron to enable log rotating
+  update_logrotate_settings
   service cron start
 fi