Jason Wilder 9 gadi atpakaļ
vecāks
revīzija
580517725f
1 mainītis faili ar 4 papildinājumiem un 6 dzēšanām
  1. 4 6
      nginx.tmpl

+ 4 - 6
nginx.tmpl

@@ -112,13 +112,11 @@ upstream {{ $host }} {
 {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
 {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
 
 
 {{/* Get the best matching cert  by name for the vhost. */}}
 {{/* Get the best matching cert  by name for the vhost. */}}
-{{ $vhostCert := "" }}
-{{ if exists "/etc/nginx/certs" }}
 {{ $vhostCert := (closest (dir "/etc/nginx/certs") (printf "%s.crt" $host))}}
 {{ $vhostCert := (closest (dir "/etc/nginx/certs") (printf "%s.crt" $host))}}
-	{{/* vhostCert is actually a filename so remove any suffixes since they are added later */}}
-	{{ $vhostCert := replace $vhostCert ".crt" "" -1 }}
-	{{ $vhostCert := replace $vhostCert ".key" "" -1 }}
-{{ end }}
+
+{{/* vhostCert is actually a filename so remove any suffixes since they are added later */}}
+{{ $vhostCert := replace $vhostCert ".crt" "" -1 }}
+{{ $vhostCert := replace $vhostCert ".key" "" -1 }}
 
 
 {{/* Use the cert specified on the container or fallback to the best vhost match */}}
 {{/* Use the cert specified on the container or fallback to the best vhost match */}}
 {{ $cert := (coalesce $certName $vhostCert) }}
 {{ $cert := (coalesce $certName $vhostCert) }}