From 991046eaebd2b58bfe160f1f296c35155dc2c0e3 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 17 Jan 2025 18:56:13 +0100
Subject: [PATCH] Removed the "listen ... http2" directive is deprecated, use
 the "http2" directive instead warning

---
 roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 | 5 +++--
 roles/docker-matrix-compose/templates/nginx.conf.j2      | 5 +++--
 roles/letsencrypt/templates/ssl_header.j2                | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 b/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2
index b9cce9c8..04b2fa44 100644
--- a/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2
+++ b/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2
@@ -1,6 +1,7 @@
 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 {{domain}};
 
   ssl_certificate /etc/letsencrypt/live/{{domain}}/fullchain.pem;
diff --git a/roles/docker-matrix-compose/templates/nginx.conf.j2 b/roles/docker-matrix-compose/templates/nginx.conf.j2
index 65f59957..8edb428b 100644
--- a/roles/docker-matrix-compose/templates/nginx.conf.j2
+++ b/roles/docker-matrix-compose/templates/nginx.conf.j2
@@ -3,8 +3,9 @@ server {
     {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
     
     # For the federation port
-    listen 8448 ssl http2 default_server;
-    listen [::]:8448 ssl http2 default_server;
+    listen 8448 ssl default_server;
+    listen [::]:8448 ssl default_server;
+    http2 on;
 
     {% if nginx_matomo_tracking | bool %}
         {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
diff --git a/roles/letsencrypt/templates/ssl_header.j2 b/roles/letsencrypt/templates/ssl_header.j2
index 5d9ab980..dcb4fd85 100644
--- a/roles/letsencrypt/templates/ssl_header.j2
+++ b/roles/letsencrypt/templates/ssl_header.j2
@@ -1,5 +1,6 @@
-listen 443 ssl http2;
-listen [::]:443 ssl http2;
+listen 443 ssl;
+listen [::]:443 ssl;
+http2 on;
 ssl_session_timeout 1d;
 ssl_session_cache shared:SSL:50m;
 ssl_session_tickets on;