merge main

nginx · Nov 26, 2023 · 8c23ebf · 8c23ebf
1 parent a75824a
commit 8c23ebf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/internal/configs/version2/nginx-plus.virtualserver.tmpl b/internal/configs/version2/nginx-plus.virtualserver.tmpl
@@ -101,7 +101,6 @@ server {
         {{- end }}
         {{- if $ssl.HTTP2 }}
     http2 on;
-<<<<<<< HEAD
         {{- end }}
 
         {{- if $ssl.RejectHandshake }}

diff --git a/internal/configs/version2/nginx.virtualserver.tmpl b/internal/configs/version2/nginx.virtualserver.tmpl
@@ -42,7 +42,6 @@ limit_req_zone {{ $z.Key }} zone={{ $z.ZoneName }}:{{ $z.ZoneSize }} rate={{ $z.
 {{- $s := .Server }}
 server {
     {{- if $s.Gunzip }}gunzip on;{{end}}
-
     {{ makeHTTPListener $s | printf }}
 
     server_name {{ $s.ServerName }};
@@ -51,9 +50,6 @@ server {
     set $resource_name "{{$s.VSName}}";
     set $resource_namespace "{{$s.VSNamespace}}";
 
-
-
-
     {{- with $ssl := $s.SSL }}
         {{- if $s.TLSPassthrough }}
     listen unix:/var/lib/nginx/passthrough-https.sock proxy_protocol;
@@ -64,8 +60,7 @@ server {
         {{- end }}
         {{- if $ssl.HTTP2 }}
     http2 on;
-    {{- end }}
-
+        {{- end }}
 
         {{- if $ssl.RejectHandshake }}
     ssl_reject_handshake on;