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

Add fix

Browse source
This commit is contained in:
Roman 2020-10-12 17:06:09 +03:00
parent 3fef39ee4b
commit 7e63b9a8b7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster.yml
View file

@ -17,6 +17,8 @@ services:
- AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq - AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq
- REDIS_SERVER_HOST=onlyoffice-redis - REDIS_SERVER_HOST=onlyoffice-redis
- REDIS_SERVER_PORT=6379 - REDIS_SERVER_PORT=6379
- LETS_ENCRYPT_DOMAINS=none
- LETS_ENCRYPT_MAIL=none
# Uncomment strings below to enable the JSON Web Token validation. # Uncomment strings below to enable the JSON Web Token validation.
#- JWT_ENABLED=true #- JWT_ENABLED=true
#- JWT_SECRET=secret #- JWT_SECRET=secret

8
run-document-server.sh
View file

@ -421,7 +421,7 @@ update_logrotate_settings(){
sed 's|\(^su\b\).*|\1 root root|' -i /etc/logrotate.conf sed 's|\(^su\b\).*|\1 root root|' -i /etc/logrotate.conf
} }
modify_conf_templated(){ modify_conf_templates(){
sed -i '$ d' ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl sed -i '$ d' ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl
cat >> ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl <<END cat >> ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl <<END
location ~ /.well-known/acme-challenge { location ~ /.well-known/acme-challenge {
@ -460,7 +460,9 @@ letsencrypt(){
mkdir -p ${ROOT_DIR} mkdir -p ${ROOT_DIR}
certbot certonly --expand --webroot -w ${ROOT_DIR} --noninteractive --agree-tos --email $LETS_ENCRYPT_MAIL $_domains; echo certbot certonly --expand --webroot -w ${ROOT_DIR} --noninteractive --agree-tos --email $LETS_ENCRYPT_MAIL $_domains > /var/log/le-start.log
certbot certonly --expand --webroot -w ${ROOT_DIR} --noninteractive --agree-tos --email $LETS_ENCRYPT_MAIL $_domains > /var/log/le-new.log
cp ${LETSENCRYPT_ROOT_DIR}/${args[0]}/fullchain.pem ${ROOT_DIR}/onlyoffice.crt cp ${LETSENCRYPT_ROOT_DIR}/${args[0]}/fullchain.pem ${ROOT_DIR}/onlyoffice.crt
cp ${LETSENCRYPT_ROOT_DIR}/${args[0]}/privkey.pem ${ROOT_DIR}/onlyoffice.key cp ${LETSENCRYPT_ROOT_DIR}/${args[0]}/privkey.pem ${ROOT_DIR}/onlyoffice.key
@ -580,7 +582,7 @@ if [ ${PG_NEW_CLUSTER} = "true" ]; then
create_postgresql_tbl create_postgresql_tbl
fi fi
modify_conf_templated modify_conf_templates
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
waiting_for_db waiting_for_db