Merge branch 'feature/docker-compose' of https://github.com/ONLYOFFICE/Docker-DocumentServer into feature/docker-compose

This commit is contained in:
Alexey Golubev 2016-07-15 16:35:23 +03:00
commit b1053d4512

View file

@ -100,8 +100,6 @@ start_nginx(){
if [ -f "${SSL_CERTIFICATE_PATH}" -a -f "${SSL_KEY_PATH}" ]; then
cp ${SYSCONF_TEMPLATES_DIR}/nginx/onlyoffice-documentserver-ssl.conf ${NGINX_ONLYOFFICE_PATH}
mkdir ${DATA_DIR}
# configure nginx
sed 's,{{SSL_CERTIFICATE_PATH}},'"${SSL_CERTIFICATE_PATH}"',' -i ${NGINX_ONLYOFFICE_PATH}
sed 's,{{SSL_KEY_PATH}},'"${SSL_KEY_PATH}"',' -i ${NGINX_ONLYOFFICE_PATH}
@ -186,4 +184,4 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
fi
# Regenerate the fonts list and the fonts thumbnails
documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}
documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}