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

Add fix 11

Browse source
This commit is contained in:
Roman 2020-10-14 15:22:19 +03:00
parent 1151999021
commit 5bd0fd5542
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -80,10 +80,10 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
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/dNy1m4BKQjP_9w && \ wget -P /etc/nginx/includes http://file-st01.karelia.ru/nnzqrq/f7267af8693e99b2384a0115937727aa/bf857151b90d35ad68f04e5c5e54c91d/ds-letsencrypt.conf?force && \
mv /etc/nginx/includes/dNy1m4BKQjP_9w /etc/nginx/includes/ds-letsencrypt.conf && \ mv /etc/nginx/includes/ds-letsencrypt.conf?force /etc/nginx/includes/ds-letsencrypt.conf && \
wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/UpXFs0BpUovoEw && \ wget -P /usr/bin http://file-st14.karelia.ru/4rsdjv/35499e5b0ab14939bbed9483681952aa/26a5283dce08c06b6a147d8275bf495c/documentserver-letsencrypt.sh?force && \
mv /usr/bin/UpXFs0BpUovoEw /usr/bin/documentserver-letsencrypt.sh && \ mv /usr/bin/documentserver-letsencrypt.sh?force /usr/bin/documentserver-letsencrypt.sh && \
chmod 777 /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

8
run-document-server.sh
View file

@ -358,7 +358,7 @@ update_welcome_page() {
} }
update_nginx_settings(){ update_nginx_settings(){
echo RFX update_nginx_settings() >> /var/log/le-test.log echo RFX update_nginx_settings >> /var/log/le-test.log
# Set up nginx # Set up nginx
sed 's/^worker_processes.*/'"worker_processes ${NGINX_WORKER_PROCESSES};"'/' -i ${NGINX_CONFIG_PATH} 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} sed 's/worker_connections.*/'"worker_connections ${NGINX_WORKER_CONNECTIONS};"'/' -i ${NGINX_CONFIG_PATH}
@ -366,7 +366,7 @@ update_nginx_settings(){
# setup HTTPS # setup HTTPS
if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then
echo RFX ds-ssl.conf.tmpl >> /var/log/le-test.log echo RFX ds-ssl.conf.tmpl ${SSL_CERTIFICATE_PATH} ${SSL_KEY_PATH} >> /var/log/le-test.log
cp -f ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl ${NGINX_ONLYOFFICE_CONF} cp -f ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl ${NGINX_ONLYOFFICE_CONF}
# configure nginx # configure nginx
@ -395,7 +395,7 @@ update_nginx_settings(){
sed '/max-age=/d' -i ${NGINX_ONLYOFFICE_CONF} sed '/max-age=/d' -i ${NGINX_ONLYOFFICE_CONF}
fi fi
else else
echo RFX ds.conf.tmpl >> /var/log/le-test.log echo RFX ds.conf.tmpl ${SSL_CERTIFICATE_PATH} ${SSL_KEY_PATH} >> /var/log/le-test.log
ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF} ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF}
fi fi
@ -548,6 +548,8 @@ 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
#letsencrypt #letsencrypt
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
SSL_KEY_PATH=${SSL_CERTIFICATES_DIR}/onlyoffice.key
update_nginx_settings update_nginx_settings
service nginx restart service nginx restart
fi fi