From 45f6cd8725744924c2d6ff63eda664925c279589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Thu, 17 Sep 2020 23:16:30 +0200
Subject: [PATCH] Aktualizace z upstreamu
---
Dockerfile | 5 +++--
run-document-server.sh | 46 +++++++++++++++++++++++++++++-------------
2 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 95e2556..a307ee3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
service postgresql restart && \
sudo -u postgres psql -c "CREATE DATABASE $ONLYOFFICE_VALUE;" && \
sudo -u postgres psql -c "CREATE USER $ONLYOFFICE_VALUE WITH password '$ONLYOFFICE_VALUE';" && \
- sudo -u postgres psql -c "GRANT ALL privileges ON DATABASE $ONLYOFFICE_VALUE TO $ONLYOFFICE_VALUE;" && \
+ sudo -u postgres psql -c "GRANT ALL privileges ON DATABASE $ONLYOFFICE_VALUE TO $ONLYOFFICE_VALUE;" && \
service postgresql stop && \
service redis-server stop && \
service rabbitmq-server stop && \
@@ -68,7 +68,8 @@ ARG REPO_URL="deb http://download.onlyoffice.com/repo/debian squeeze main"
ARG COMPANY_NAME=onlyoffice
ARG PRODUCT_NAME=documentserver
-ENV COMPANY_NAME=$COMPANY_NAME
+ENV COMPANY_NAME=$COMPANY_NAME \
+ PRODUCT_NAME=$PRODUCT_NAME
RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
apt-get -y update && \
diff --git a/run-document-server.sh b/run-document-server.sh
index 5fe88c2..f47662f 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -16,8 +16,16 @@ ONLYOFFICE_DATA_CONTAINER_HOST=${ONLYOFFICE_DATA_CONTAINER_HOST:-localhost}
ONLYOFFICE_DATA_CONTAINER_PORT=80
SSL_CERTIFICATES_DIR="${DATA_DIR}/certs"
-SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-${SSL_CERTIFICATES_DIR}/onlyoffice.crt}
-SSL_KEY_PATH=${SSL_KEY_PATH:-${SSL_CERTIFICATES_DIR}/onlyoffice.key}
+if [[ -z $SSL_CERTIFICATE_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/onlyoffice.crt ]]; then
+ SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt
+else
+ SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-${SSL_CERTIFICATES_DIR}/tls.crt}
+fi
+if [[ -z $SSL_KEY_PATH ]] && [[ -f ${SSL_CERTIFICATES_DIR}/onlyoffice.key ]]; then
+ SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key
+else
+ SSL_KEY_PATH=${SSL_KEY_PATH:-${SSL_CERTIFICATES_DIR}/tls.key}
+fi
CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-${SSL_CERTIFICATES_DIR}/ca-certificates.pem}
SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-${SSL_CERTIFICATES_DIR}/dhparam.pem}
SSL_VERIFY_CLIENT=${SSL_VERIFY_CLIENT:-off}
@@ -41,6 +49,12 @@ JWT_SECRET=${JWT_SECRET:-secret}
JWT_HEADER=${JWT_HEADER:-Authorization}
JWT_IN_BODY=${JWT_IN_BODY:-false}
+if [[ ${PRODUCT_NAME} == "documentserver" ]]; then
+ REDIS_ENABLED=false
+else
+ REDIS_ENABLED=true
+fi
+
ONLYOFFICE_DEFAULT_CONFIG=${CONF_DIR}/local.json
ONLYOFFICE_LOG4JS_CONFIG=${CONF_DIR}/log4js/production.json
ONLYOFFICE_EXAMPLE_CONFIG=${CONF_DIR}-example/local.json
@@ -270,9 +284,9 @@ create_postgresql_cluster(){
}
create_postgresql_db(){
- sudo -u postgres psql -c "CREATE DATABASE onlyoffice;"
- sudo -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';"
- sudo -u postgres psql -c "GRANT ALL privileges ON DATABASE onlyoffice TO onlyoffice;"
+ sudo -u postgres psql -c "CREATE DATABASE $DB_NAME;"
+ sudo -u postgres psql -c "CREATE USER $DB_USER WITH password '"$DB_PWD"';"
+ sudo -u postgres psql -c "GRANT ALL privileges ON DATABASE $DB_NAME TO $DB_USER;"
}
create_db_tbl() {
@@ -296,7 +310,7 @@ create_postgresql_tbl() {
CREATEDB="createdb $CONNECTION_PARAMS"
# Create db on remote server
- if $PSQL -lt | cut -d\| -f 1 | grep -qw | grep 0; then
+ if $PSQL -lt | cut -d\| -f 1 | grep -qw $DB_NAME | grep 0; then
$CREATEDB $DB_NAME
fi
@@ -451,14 +465,16 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
rm -rf /var/run/rabbitmq
fi
- if [ ${REDIS_SERVER_HOST} != "localhost" ]; then
- update_redis_settings
- else
- # change rights for redis directory
- chown -R redis:redis ${REDIS_DATA}
- chmod -R 750 ${REDIS_DATA}
+ if [ ${REDIS_ENABLED} = "true" ]; then
+ if [ ${REDIS_SERVER_HOST} != "localhost" ]; then
+ update_redis_settings
+ else
+ # change rights for redis directory
+ chown -R redis:redis ${REDIS_DATA}
+ chmod -R 750 ${REDIS_DATA}
- LOCAL_SERVICES+=("redis-server")
+ LOCAL_SERVICES+=("redis-server")
+ fi
fi
else
# no need to update settings just wait for remote data
@@ -484,7 +500,9 @@ fi
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
waiting_for_db
waiting_for_amqp
- waiting_for_redis
+ if [ ${REDIS_ENABLED} = "true" ]; then
+ waiting_for_redis
+ fi
update_nginx_settings
--
GitLab