From 234e333d6f80c12692054be3b0593c339b576e29 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Thu, 25 Jan 2024 23:09:42 -0300 Subject: [PATCH] Remove http2 deprecated arg --- internal/ingress/controller/template/template.go | 6 +----- rootfs/etc/nginx/template/nginx.tmpl | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/ingress/controller/template/template.go b/internal/ingress/controller/template/template.go index 7410ce6e0..68ab1b660 100644 --- a/internal/ingress/controller/template/template.go +++ b/internal/ingress/controller/template/template.go @@ -1502,12 +1502,8 @@ func httpsListener(addresses []string, co string, tc *config.TemplateConfig) []s } lo = append(lo, co, "ssl") - - if tc.Cfg.UseHTTP2 { - lo = append(lo, "http2") - } - lo = append(lo, ";") + out = append(out, strings.Join(lo, " ")) } diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 500a212b6..d58be2880 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -658,6 +658,10 @@ http { server { server_name {{ buildServerName $server.Hostname }} {{range $server.Aliases }}{{ . }} {{ end }}; + {{ if $cfg.UseHTTP2 }} + http2 on; + {{ end }} + {{ if gt (len $cfg.BlockUserAgents) 0 }} if ($block_ua) { return 403;