From b2b296f122be6071e3afe8cba5fa34cf54602ad7 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Tue, 28 May 2024 19:45:30 +0100
Subject: [PATCH 1/3] Update default conf with new http2 directive

---
 README.md                                          |  1 +
 readme-vars.yml                                    |  1 +
 root/defaults/nginx/site-confs/default.conf.sample | 10 ++++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5857ed8..8a43082 100644
--- a/README.md
+++ b/README.md
@@ -292,6 +292,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.05.24:** - Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings.
 * **24.05.24:** - Rebase to Alpine 3.20.
 * **16.04.24:** - Rebase to Alpine 3.19, upgrade to php 8.3.
 * **10.02.24:** - Initial Release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 414ee97..464a339 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: "16.04.24:", desc: "Rebase to Alpine 3.19, upgrade to php 8.3." }
   - { date: "10.02.24:", desc: "Initial Release." }
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 5bb3056..3be229c 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,11 +1,13 @@
-## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-speedtest-tracker/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/05/28 - Changelog: https://github.com/linuxserver/docker-speedtest-tracker/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 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 _;
 
@@ -33,4 +35,4 @@ server {
     location ~ /\.ht {
         deny all;
     }
-}
\ No newline at end of file
+}

From a3a40f0510b683fcfcbe7da50462c0287dfcaa4d Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Tue, 28 May 2024 20:11:43 +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 464a339..3db9c70 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: "16.04.24:", desc: "Rebase to Alpine 3.19, upgrade to php 8.3." }
   - { date: "10.02.24:", desc: "Initial Release." }
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 3be229c..cf8d8d8 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -7,8 +7,6 @@ server {
     listen 443 ssl default_server;
     listen [::]:443 ssl default_server;
 
-    http2 on;
-
     server_name _;
 
     include /config/nginx/ssl.conf;

From b32236ad6526d408d6dfce65c0038aa3ac153d08 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Wed, 29 May 2024 13:59:07 +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 cf8d8d8..4b4ac69 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,11 +1,8 @@
 ## Version 2024/05/28 - Changelog: https://github.com/linuxserver/docker-speedtest-tracker/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 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 _;