diff --git a/Dockerfile b/Dockerfile index 62848cc..43b1d88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,7 +81,7 @@ RUN \ php7-xsl \ php7-zip && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ + rm -f /etc/nginx/http.d/default.conf && \ sed -i \ 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ /defaults/nginx.conf diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6e2cb51..a982803 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -81,7 +81,7 @@ RUN \ php7-xsl \ php7-zip && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ + rm -f /etc/nginx/http.d/default.conf && \ sed -i \ 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ /defaults/nginx.conf diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c88dbab..6f245c3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -81,7 +81,7 @@ RUN \ php7-xsl \ php7-zip && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ + rm -f /etc/nginx/http.d/default.conf && \ sed -i \ 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \ /defaults/nginx.conf diff --git a/README.md b/README.md index 957364e..a5d04e1 100644 --- a/README.md +++ b/README.md @@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.21:** - Update default nginx conf folder. * **12.04.21:** - Add php7-gmp and php7-pecl-mailparse. * **13.02.21:** - Remove php7-pecl-imagick (it now installs the full imagemagick with too much crud). Users can install it via [this docker mod](https://github.com/linuxserver/docker-mods/tree/swag-imagemagick). * **09.02.21:** - Rebasing to alpine 3.13. Add nginx mods brotli and dav-ext. Remove nginx mods lua and lua-upstream (due to regression over the last couple of years). diff --git a/readme-vars.yml b/readme-vars.yml index 2da4e04..acd0222 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,6 +40,7 @@ app_setup_block: | # changelog changelogs: + - { date: "24.06.21:", desc: "Update default nginx conf folder." } - { date: "12.04.21:", desc: "Add php7-gmp and php7-pecl-mailparse." } - { date: "13.02.21:", desc: "Remove php7-pecl-imagick (it now installs the full imagemagick with too much crud). Users can install it via [this docker mod](https://github.com/linuxserver/docker-mods/tree/swag-imagemagick)." } - { date: "09.02.21:", desc: "Rebasing to alpine 3.13. Add nginx mods brotli and dav-ext. Remove nginx mods lua and lua-upstream (due to regression over the last couple of years)." }