Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add fix 15

Browse source
This commit is contained in:
Roman 2020-10-19 16:58:40 +03:00
parent 2384a87d74
commit 4e1cc4f25a
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -79,7 +79,12 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
service supervisor stop && \ service supervisor stop && \
chmod 755 /app/ds/*.sh && \ chmod 755 /app/ds/*.sh && \
rm -rf /var/log/$COMPANY_NAME && \ 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 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

11
run-document-server.sh
View file

@ -542,10 +542,13 @@ service nginx start
if [ ${LETS_ENCRYPT_DOMAIN} != "none" -a ${LETS_ENCRYPT_MAIL} != "none" ]; then if [ ${LETS_ENCRYPT_DOMAIN} != "none" -a ${LETS_ENCRYPT_MAIL} != "none" ]; then
if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then
documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN} documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN}
SSL_CERTIFICATE_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.crt LETSENCRYPT_ROOT_DIR="/etc/letsencrypt/live"
SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key #SSL_CERTIFICATE_PATH=${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/fullchain.pem
update_nginx_settings #SSL_KEY_PATH=${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/privkey.pem
service nginx restart 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
fi fi