diff --git a/Dockerfile b/Dockerfile index 69ec5dc..6cdfdb5 100755 --- a/Dockerfile +++ b/Dockerfile @@ -139,7 +139,7 @@ RUN \ /tmp/proxy.tar.gz -C \ /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ + rm -f /etc/nginx/http.d/default.conf && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 89a51ac..de75f45 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -139,7 +139,7 @@ RUN \ /tmp/proxy.tar.gz -C \ /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ + rm -f /etc/nginx/http.d/default.conf && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0047bf6..070529e 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -139,7 +139,7 @@ RUN \ /tmp/proxy.tar.gz -C \ /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ + rm -f /etc/nginx/http.d/default.conf && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/README.md b/README.md index 4eed7b9..2aa3a5f 100644 --- a/README.md +++ b/README.md @@ -330,6 +330,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.21:** - Update default nginx conf folder. * **28.05.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`. * **20.05.21:** - Modify resolver.conf generation to detect and ignore ipv6. * **14.05.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, ssl.conf, proxy.conf, and the default site-conf - Rework nginx.conf to be inline with alpine upstream and relocate lines from other files. Use linuxserver.io wheel index for pip packages. Switch to using [ffdhe4096](https://ssl-config.mozilla.org/ffdhe4096.txt) for `dhparams.pem` per [RFC7919](https://datatracker.ietf.org/doc/html/rfc7919). Added `worker_processes.conf`, which sets the number of nginx workers, and `resolver.conf`, which sets the dns resolver. Both conf files are auto-generated only on first start and can be user modified later. diff --git a/readme-vars.yml b/readme-vars.yml index c013210..51594b8 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -151,6 +151,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "24.06.21:", desc: "Update default nginx conf folder." } - { date: "28.05.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`." } - { date: "20.05.21:", desc: "Modify resolver.conf generation to detect and ignore ipv6." } - { date: "14.05.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, ssl.conf, proxy.conf, and the default site-conf - Rework nginx.conf to be inline with alpine upstream and relocate lines from other files. Use linuxserver.io wheel index for pip packages. Switch to using [ffdhe4096](https://ssl-config.mozilla.org/ffdhe4096.txt) for `dhparams.pem` per [RFC7919](https://datatracker.ietf.org/doc/html/rfc7919). Added `worker_processes.conf`, which sets the number of nginx workers, and `resolver.conf`, which sets the dns resolver. Both conf files are auto-generated only on first start and can be user modified later." }