Explorar o código

regexp: use sha1 for upstream only if regexp is used

avoid confusions such as in #677
Thomas LEVEIL %!s(int64=8) %!d(string=hai) anos
pai
achega
3f6381d0fa
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      nginx.tmpl

+ 2 - 1
nginx.tmpl

@@ -92,7 +92,8 @@ server {
 {{ end }}
 
 {{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
-{{ $upstream_name := sha1 $host }}
+{{ $is_regexp := hasPrefix "~" $host }}
+{{ $upstream_name := when $is_regexp (sha1 $host) $host }}
 # {{ $host }}
 upstream {{ $upstream_name }} {
 {{ range $container := $containers }}