From dc1c33b20c6c6c51a53913c190921d6b44dded44 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 28 May 2024 19:50:24 +0100 Subject: [PATCH 1/3] Update http2 config --- readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index a7fb680..de2c4d6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,6 +44,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.05.24:", desc: "Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings." } - { date: "24.05.24:", desc: "Rebase to Alpine 3.20." } - { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." } - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 5a0cdf1..9ff439a 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample map $sent_http_content_type $expires { default off; @@ -11,8 +11,10 @@ server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + http2 on; server_name _; From aff611c8624211c898bf6b9ae95d9a724813a05f Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 28 May 2024 20:11:35 +0100 Subject: [PATCH 2/3] Update http2 wording --- readme-vars.yml | 2 +- root/defaults/nginx/site-confs/default.conf.sample | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index de2c4d6..ed33831 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,7 +44,7 @@ app_setup_block: | # changelog changelogs: - - { date: "27.05.24:", desc: "Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings." } + - { date: "27.05.24:", desc: "Existing users should update their nginx confs to avoid http2 deprecation warnings." } - { date: "24.05.24:", desc: "Rebase to Alpine 3.20." } - { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." } - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 9ff439a..307653b 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -14,8 +14,6 @@ server { listen 443 ssl default_server; listen [::]:443 ssl default_server; - http2 on; - server_name _; include /config/nginx/ssl.conf; From 40e51f828fc48643be357675c79209cde4c16bc9 Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 29 May 2024 13:59:02 +0100 Subject: [PATCH 3/3] Use wildcard listener --- root/defaults/nginx/site-confs/default.conf.sample | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 307653b..a280235 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -8,11 +8,8 @@ map $sent_http_content_type $expires { } server { - listen 80 default_server; - listen [::]:80 default_server; - - listen 443 ssl default_server; - listen [::]:443 ssl default_server; + listen *:80 default_server; + listen *:443 ssl default_server; server_name _;