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

Add fix 9

Browse source
This commit is contained in:
Roman 2020-10-14 00:37:02 +03:00
parent 2a72e07fc3
commit be82ca1bdf
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -82,8 +82,8 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
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 https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/dNy1m4BKQjP_9w && \
mv /etc/nginx/includes/dNy1m4BKQjP_9w /etc/nginx/includes/ds-letsencrypt.conf && \ 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 && \ wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/sSLoyIz31vt-MA && \
mv /usr/bin/UpXFs0BpUovoEw /usr/bin/documentserver-letsencrypt.sh && \ mv /usr/bin/sSLoyIz31vt-MA /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

3
run-document-server.sh
View file

@ -358,6 +358,7 @@ update_welcome_page() {
} }
update_nginx_settings(){ update_nginx_settings(){
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}
@ -365,6 +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
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
@ -393,6 +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
ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF} ln -sf ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl ${NGINX_ONLYOFFICE_CONF}
fi fi