thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-08-24 00:11:55 +00:00
Code Issues Releases Wiki Activity

Merged conflict in BATS SSL test

Browse Source
This commit is contained in:
Steve Kamerman
2017-01-26 13:46:11 -05:00
parent 83a28f47d7 2c5d4ee3a9
commit d320b43476
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nginx.tmpl
View File

@@ -147,7 +147,7 @@ upstream {{ $upstream_name }} {
{{/* Use the cert specified on the container or fallback to the best vhost match */}}
{{ $cert := (coalesce $certName $vhostCert) }}
{{ $is_https := (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 $is_https }}