From 305e2398d89053e18a1e2b9ed30f58be7848ffeb Mon Sep 17 00:00:00 2001 From: Tealk Date: Wed, 25 Sep 2024 08:47:11 +0200 Subject: [PATCH 1/3] Fix Warnung: the "listen ... http2" directive is deprecated Signed-off-by: Tealk --- templates/web.ssl.template.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/web.ssl.template.yml b/templates/web.ssl.template.yml index cefd1aa57..ac8e10d15 100644 --- a/templates/web.ssl.template.yml +++ b/templates/web.ssl.template.yml @@ -15,14 +15,16 @@ run: filename: "/etc/nginx/conf.d/discourse.conf" from: /listen 80;\s+gzip on;/m to: | - listen 443 ssl http2; + listen 443 ssl; + http2; SSL_TEMPLATE_SSL_BLOCK - replace: filename: "/etc/nginx/conf.d/discourse.conf" from: /listen 80;\s+listen \[::\]:80;\s+gzip on;/m to: | - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl; + listen [::]:443 ssl; + http2; SSL_TEMPLATE_SSL_BLOCK - replace: hook: ssl From 5891a96b99750dc838e023c9e372f190e3bed040 Mon Sep 17 00:00:00 2001 From: Tealk <12276250+Tealk@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:23:33 +0200 Subject: [PATCH 2/3] Update templates/web.ssl.template.yml Co-authored-by: Alan Guo Xiang Tan --- templates/web.ssl.template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web.ssl.template.yml b/templates/web.ssl.template.yml index ac8e10d15..2e962b6f9 100644 --- a/templates/web.ssl.template.yml +++ b/templates/web.ssl.template.yml @@ -16,7 +16,7 @@ run: from: /listen 80;\s+gzip on;/m to: | listen 443 ssl; - http2; + http2 on; SSL_TEMPLATE_SSL_BLOCK - replace: filename: "/etc/nginx/conf.d/discourse.conf" From 6199a4b288dcff725968a3ab3a8b4ed34c8c72f1 Mon Sep 17 00:00:00 2001 From: Tealk Date: Mon, 7 Oct 2024 08:25:21 +0200 Subject: [PATCH 3/3] add on to http2 --- templates/web.ssl.template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web.ssl.template.yml b/templates/web.ssl.template.yml index 2e962b6f9..cc6a66fe0 100644 --- a/templates/web.ssl.template.yml +++ b/templates/web.ssl.template.yml @@ -24,7 +24,7 @@ run: to: | listen 443 ssl; listen [::]:443 ssl; - http2; + http2 on; SSL_TEMPLATE_SSL_BLOCK - replace: hook: ssl