diff --git a/Dockerfile b/Dockerfile index 6002cc2..f3b76ea 100755 --- a/Dockerfile +++ b/Dockerfile @@ -144,6 +144,8 @@ RUN \ sed -i \ 's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \ /defaults/nginx/ssl.conf.sample && \ + echo "**** remove stream.conf ****" && \ + rm -f /etc/nginx/conf.d/stream.conf && \ echo "**** correct ip6tables legacy issue ****" && \ rm \ /sbin/ip6tables && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 03a077d..82f0b0a 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -144,6 +144,8 @@ RUN \ sed -i \ 's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \ /defaults/nginx/ssl.conf.sample && \ + echo "**** remove stream.conf ****" && \ + rm -f /etc/nginx/conf.d/stream.conf && \ echo "**** correct ip6tables legacy issue ****" && \ rm \ /sbin/ip6tables && \ diff --git a/README.md b/README.md index 7b66d89..97b910f 100644 --- a/README.md +++ b/README.md @@ -400,6 +400,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.03.24:** - Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`. * **23.01.24:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate. * **01.01.24:** - Add GleSYS DNS plugin. * **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins. diff --git a/readme-vars.yml b/readme-vars.yml index f5ce7db..9ee7aa3 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -168,6 +168,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.03.24:", desc: "Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`." } - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." } - { date: "01.01.24:", desc: "Add GleSYS DNS plugin." } - { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }