diff --git a/Dockerfile b/Dockerfile index ea599e1..b4afd59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/run-document-server.sh b/run-document-server.sh index 9cedc1c..304198b 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -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 <> ${NGINX_ONLYOFFICE_PATH}/ds-ssl.conf.tmpl < /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 <> /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 <