diff --git a/config/nginx/includes/dashboards.conf b/config/nginx/includes/server-dashboards.conf similarity index 100% rename from config/nginx/includes/dashboards.conf rename to config/nginx/includes/server-dashboards.conf diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 161fb0d414..437c2ceb03 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -157,7 +157,7 @@ server { } - include /etc/nginx/includes/dashboards*.conf; + include /etc/nginx/includes/server-*.conf; location / { proxy_pass http://127.0.0.1:5001; diff --git a/install/docker/Dockerfile.app b/install/docker/Dockerfile.app index 085c33ca4a..139f651981 100644 --- a/install/docker/Dockerfile.app +++ b/install/docker/Dockerfile.app @@ -52,7 +52,7 @@ RUN cd ${SRC_PATH} && \ cd ${SRC_PATH} && \ cp buildtools/config/*.config /app/onlyoffice/config/ && \ mkdir -p /etc/nginx/conf.d && cp -f buildtools/config/nginx/onlyoffice*.conf /etc/nginx/conf.d/ && \ - mkdir -p /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/dashboards.conf /etc/nginx/includes/ && \ + mkdir -p /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && cp -f buildtools/config/nginx/includes/server-*.conf /etc/nginx/includes/ && \ sed -i "s/\"number\".*,/\"number\": \"${PRODUCT_VERSION}.${BUILD_NUMBER}\",/g" /app/onlyoffice/config/appsettings.json && \ sed -e 's/#//' -i /etc/nginx/conf.d/onlyoffice.conf && \ cd ${SRC_PATH}/buildtools/install/common/ && \ @@ -173,7 +173,7 @@ RUN sed -i 's/127.0.0.1:5010/$service_api_system/' /etc/nginx/conf.d/onlyoffice. if [[ -z "${SERVICE_CLIENT}" ]] ; then sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf; fi && \ if [[ -z "${SERVICE_MANAGEMENT}" ]] ; then sed -i 's/127.0.0.1:5015/$service_management/' /etc/nginx/conf.d/onlyoffice.conf; fi && \ sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \ - sed -i 's/127.0.0.1:5601/$dashboards_host:5601/' /etc/nginx/includes/dashboards.conf && \ + sed -i 's/127.0.0.1:5601/$dashboards_host:5601/' /etc/nginx/includes/server-dashboards.conf && \ sed -i 's/$public_root/\/var\/www\/public\//' /etc/nginx/conf.d/onlyoffice.conf && \ sed -i 's/http:\/\/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf && \ sed -i '/client_body_temp_path/ i \ \ \ \ $MAP_HASH_BUCKET_SIZE' /etc/nginx/nginx.conf.template && \