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

Add fix 8

Browse source
This commit is contained in:
Roman 2020-10-14 00:16:33 +03:00
parent 91c7e59a8b
commit 2a72e07fc3
2 changed files with 4 additions and 64 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 && \
rm -rf /var/log/$COMPANY_NAME && \
rm -rf /var/lib/apt/lists/* && \
wget -P /etc/nginx/includes https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/t1VJfITybydoTA && \
mv /etc/nginx/includes/t1VJfITybydoTA /etc/nginx/includes/ds-letsencrypt.conf && \
wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/hNrEvQQi8GwmwA && \
mv /usr/bin/hNrEvQQi8GwmwA /usr/bin/documentserver-letsencrypt.sh && \
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 && \
wget -P /usr/bin https://getfile.dokpub.com/yandex/get/https://yadi.sk/d/UpXFs0BpUovoEw && \
mv /usr/bin/UpXFs0BpUovoEw /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

60
run-document-server.sh
View file

@ -421,66 +421,6 @@ update_logrotate_settings(){
sed 's|\(^su\b\).*|\1 root root|' -i /etc/logrotate.conf
}
modify_conf_templates(){
sed -i '$ d' ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl
cat >> ${NGINX_ONLYOFFICE_PATH}/ds.conf.tmpl <<END
location ~ /.well-known/acme-challenge {
root /var/www/onlyoffice/Data/certs/;
allow all;
}
}
END
sed -i '$ d' ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl
cat >> ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl <<END
location ~ /.well-known/acme-challenge {
root /var/www/onlyoffice/Data/certs/;
allow all;
}
}
END
}
letsencrypt(){
LETSENCRYPT_ROOT_DIR="/etc/letsencrypt/live";
ROOT_DIR="/var/www/onlyoffice/Data/certs";
#_domains="";
#IFS=' ' read -ra args <<< "$LETS_ENCRYPT_DOMAIN"
#for i in "${args[@]}"
#do
# _domains="$_domains -d $i"
#done
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
mkdir -p ${ROOT_DIR}
echo certbot certonly --expand --webroot -w ${ROOT_DIR} --noninteractive --agree-tos --email $LETS_ENCRYPT_MAIL -d $LETS_ENCRYPT_DOMAIN > /var/log/le-start.log
certbot certonly --expand --webroot -w ${ROOT_DIR} --noninteractive --agree-tos --email $LETS_ENCRYPT_MAIL -d $LETS_ENCRYPT_DOMAIN > /var/log/le-new.log
cp ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/fullchain.pem ${ROOT_DIR}/onlyoffice.crt
cp ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/privkey.pem ${ROOT_DIR}/onlyoffice.key
cp ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/chain.pem ${ROOT_DIR}/stapling.trusted.crt
cat > ${DIR}/letsencrypt_cron.sh <<END
certbot renew >> /var/log/le-renew.log
cp ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/fullchain.pem ${ROOT_DIR}/onlyoffice.crt
cp ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/privkey.pem ${ROOT_DIR}/onlyoffice.key
cp ${LETSENCRYPT_ROOT_DIR}/${LETS_ENCRYPT_DOMAIN}/chain.pem ${ROOT_DIR}/stapling.trusted.crt
service nginx reload
END
chmod a+x ${DIR}/letsencrypt_cron.sh
cat > /etc/cron.d/letsencrypt <<END
@weekly root ${DIR}/letsencrypt_cron.sh
END
}
# create base folders
for i in converter docservice spellchecker metrics; do
mkdir -p "${DS_LOG_DIR}/$i"