thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-11-03 18:49:20 +00:00
Code Issues Releases Wiki Activity

chore: Split $is_https variable into two separate checks

Browse Source 
for improved readability.
This commit is contained in:
Richard Hansen
2023-02-01 18:17:43 -05:00
committed by Nicolas Duchon
parent 7ca1da8358
commit 7a2b1f8833
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nginx.tmpl
View File

@@ -444,10 +444,9 @@ server {
* match. * match.
*/}} */}}
{{- $cert := (coalesce $certName $vhostCert) }} {{- $cert := (coalesce $certName $vhostCert) }}
{{- $cert_ok := and (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert)) }}
{{- $is_https := (and (ne $https_method "nohttps") (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }} {{- if and $cert_ok (eq $https_method "redirect") }}
{{- if and $is_https (eq $https_method "redirect") }}
server { server {
server_name {{ $host }}; server_name {{ $host }};
{{- if $server_tokens }} {{- if $server_tokens }}
@@ -485,13 +484,13 @@ server {
server_tokens {{ $server_tokens }}; server_tokens {{ $server_tokens }};
{{- end }} {{- end }}
{{ $globals.access_log }} {{ $globals.access_log }}
{{- if or (not $is_https) (eq $https_method "noredirect") }} {{- if or (eq $https_method "nohttps") (not $cert_ok) (eq $https_method "noredirect") }}
listen {{ $globals.external_http_port }} {{ $default_server }}; listen {{ $globals.external_http_port }} {{ $default_server }};
{{- if $globals.enable_ipv6 }} {{- if $globals.enable_ipv6 }}
listen [::]:{{ $globals.external_http_port }} {{ $default_server }}; listen [::]:{{ $globals.external_http_port }} {{ $default_server }};
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if $is_https }} {{- if and (ne $https_method "nohttps") $cert_ok }}
listen {{ $globals.external_https_port }} ssl http2 {{ $default_server }}; listen {{ $globals.external_https_port }} ssl http2 {{ $default_server }};
{{- if $globals.enable_ipv6 }} {{- if $globals.enable_ipv6 }}
listen [::]:{{ $globals.external_https_port }} ssl http2 {{ $default_server }}; listen [::]:{{ $globals.external_https_port }} ssl http2 {{ $default_server }};
@@ -559,7 +558,7 @@ server {
{{- end }} {{- end }}
} }
{{- if (and (not $is_https) (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} {{- if and (or (eq $https_method "nohttps") (not $cert_ok)) (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key") }}
server { server {
server_name {{ $host }}; server_name {{ $host }};
{{- if $server_tokens }} {{- if $server_tokens }}