From 4e1cc4f25a22950ffae77cad0a6a54a38b875c64 Mon Sep 17 00:00:00 2001
From: Roman <demidov.roman@onlyoffice.com>
Date: Mon, 19 Oct 2020 16:58:40 +0300
Subject: [PATCH] Add fix 15

---
 Dockerfile             |  7 ++++++-
 run-document-server.sh | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75e5bca..c7b5c05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,7 +79,12 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
     service supervisor stop && \
     chmod 755 /app/ds/*.sh && \
     rm -rf /var/log/$COMPANY_NAME && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    wget -P /etc/nginx/includes https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/OsmWglaAUELF3Q && \
+    mv /etc/nginx/includes/OsmWglaAUELF3Q /etc/nginx/includes/ds-letsencrypt.conf && \
+    wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/DG5OsrETKF24fw && \
+    mv /usr/bin/DG5OsrETKF24fw /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 bbd3987..f8f1529 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -542,10 +542,13 @@ service nginx start
 if [ ${LETS_ENCRYPT_DOMAIN} != "none" -a ${LETS_ENCRYPT_MAIL} != "none" ]; then
   if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then
     documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN}
-    SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt
-    SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key
-    update_nginx_settings
-    service nginx restart
+    LETSENCRYPT_ROOT_DIR="/etc/letsencrypt/live"
+    #SSL_CERTIFICATE_PATH=${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/fullchain.pem
+    #SSL_KEY_PATH=${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/privkey.pem
+    ln -sf ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/fullchain.pem ${SSL_CERTIFICATES_DIR}/onlyoffice.crt
+    ln -sf ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/privkey.pem ${SSL_CERTIFICATES_DIR}/onlyoffice.key
+    #update_nginx_settings
+    #service nginx restart
   fi
 fi