From be82ca1bdfdeb2c0b60b6de8d7f469937ff00e79 Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 14 Oct 2020 00:37:02 +0300 Subject: [PATCH] Add fix 9 --- Dockerfile | 4 ++-- run-document-server.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4afd59..1103067 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,8 +82,8 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \ rm -rf /var/lib/apt/lists/* && \ wget -P /etc/nginx/includes https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/dNy1m4BKQjP_9w && \ mv /etc/nginx/includes/dNy1m4BKQjP_9w /etc/nginx/includes/ds-letsencrypt.conf && \ - wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/UpXFs0BpUovoEw && \ - mv /usr/bin/UpXFs0BpUovoEw /usr/bin/documentserver-letsencrypt.sh && \ + wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/sSLoyIz31vt-MA && \ + mv /usr/bin/sSLoyIz31vt-MA /usr/bin/documentserver-letsencrypt.sh && \ chmod 777 /usr/bin/documentserver-letsencrypt.sh VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom diff --git a/run-document-server.sh b/run-document-server.sh index 304198b..169f0f5 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -358,6 +358,7 @@ update_welcome_page() { } update_nginx_settings(){ + echo RFX update_nginx_settings() >> /var/log/le-test.log # Set up nginx sed 's/^worker_processes.*/'"worker_processes ${NGINX_WORKER_PROCESSES};"'/' -i ${NGINX_CONFIG_PATH} sed 's/worker_connections.*/'"worker_connections ${NGINX_WORKER_CONNECTIONS};"'/' -i ${NGINX_CONFIG_PATH} @@ -365,6 +366,7 @@ update_nginx_settings(){ # setup HTTPS if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then + echo RFX ds-ssl.conf.tmpl >> /var/log/le-test.log cp -f ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl ${NGINX_ONLYOFFICE_CONF} # configure nginx @@ -393,6 +395,7 @@ update_nginx_settings(){ sed '/max-age=/d' -i ${NGINX_ONLYOFFICE_CONF} fi else + echo RFX ds.conf.tmpl >> /var/log/le-test.log ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF} fi