Support paths with VIRTUAL_PATH

Author: md5

nginx.tmpl

@@ -1,3 +1,21 @@
+{{ define "upstream-block" }}
+upstream {{ .Host }}{{ .Suffix }} {
+{{ range $container := .Containers }}
+	{{ $addrLen := len $container.Addresses }}
+	{{/* If only 1 port exposed, use that */}}
+	{{ if eq $addrLen 1 }}
+		{{ $address := index $container.Addresses 0 }}
+		{{ template "upstream" (dict "Container" $container "Address" $address) }}
+	{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var, falling back to standard web port 80 */}}
+	{{ else }}
+		{{ $port := coalesce $container.Env.VIRTUAL_PORT "80" }}
+		{{ $address := where $container.Addresses "Port" $port | first }}
+		{{ template "upstream" (dict "Container" $container "Address" $address) }}
+	{{ end }}
+{{ end }}
+}
+{{ end }}
+
 {{ define "upstream" }}
 	{{ if .Address }}
 		{{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}}
@@ -71,22 +89,17 @@ server {
 {{ end }}
 
 {{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
-
-upstream {{ $host }} {
-{{ range $container := $containers }}
-	{{ $addrLen := len $container.Addresses }}
-	{{/* If only 1 port exposed, use that */}}
-	{{ if eq $addrLen 1 }}
-		{{ $address := index $container.Addresses 0 }}
-		{{ template "upstream" (dict "Container" $container "Address" $address) }}
-	{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var, falling back to standard web port 80 */}}
-	{{ else }}
-		{{ $port := coalesce $container.Env.VIRTUAL_PORT "80" }}
-		{{ $address := where $container.Addresses "Port" $port | first }}
-		{{ template "upstream" (dict "Container" $container "Address" $address) }}
+{{ $paths := groupBy $containers "Env.VIRTUAL_PATH" }}
+{{ $pathCount := len $paths }}
+{{ if eq $pathCount 0 }}
+	{{ template "upstream-block" dict "Host" $host "Suffix" "" "Containers" $containers }}
+{{ else }}
+	{{ range $path, $containers := $paths }}
+		{{ $sum := sha1 $path }}
+		{{ $suffix := printf "-%s" $sum }}
+		{{ template "upstream-block" dict "Host" $host "Suffix" $suffix "Containers" $containers }}
 	{{ end }}
 {{ end }}
-}
 
 {{ $default_host := or ($.Env.DEFAULT_HOST) "" }}
 {{ $default_server := index (dict $host "" $default_host "default_server") $host }}
@@ -143,6 +156,7 @@ server {
 	include /etc/nginx/vhost.d/default;
 	{{ end }}
 
+	{{ if eq $pathCount 0 }}
 	location / {
 		proxy_pass {{ $proto }}://{{ $host }};
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
@@ -155,6 +169,24 @@ server {
                 include /etc/nginx/vhost.d/default_location;
                 {{ end }}
 	}
+	{{ else }}
+		{{ range $path, $containers := $paths }}
+			{{ $sum := sha1 $path }}
+			{{ $suffix := printf "-%s" $sum }}
+			location {{ $path }} {
+				proxy_pass http://{{ $host }}{{ $suffix }};
+				{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
+				auth_basic	"Restricted {{ $host }}";
+				auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};
+				{{ end }}
+                                {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
+                                include {{ printf "/etc/nginx/vhost.d/%s_location" $host }};
+                                {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
+                                include /etc/nginx/vhost.d/default_location;
+                                {{ end }}
+			}
+		{{ end }}
+	{{ end }}
 }
 {{ else }}
 
@@ -169,6 +201,7 @@ server {
 	include /etc/nginx/vhost.d/default;
 	{{ end }}
 
+	{{ if eq $pathCount 0 }}
 	location / {
 		proxy_pass {{ $proto }}://{{ $host }};
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
@@ -181,6 +214,24 @@ server {
                 include /etc/nginx/vhost.d/default_location;
                 {{ end }}
 	}
+	{{ else }}
+		{{ range $path, $containers := $paths }}
+			{{ $sum := sha1 $path }}
+			{{ $suffix := printf "-%s" $sum }}
+			location {{ $path }} {
+				proxy_pass http://{{ $host }}{{ $suffix }};
+				{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
+				auth_basic	"Restricted {{ $host }}";
+				auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};
+				{{ end }}
+                                {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
+                                include {{ printf "/etc/nginx/vhost.d/%s_location" $host }};
+                                {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
+                                include /etc/nginx/vhost.d/default_location;
+                                {{ end }}
+			}
+		{{ end }}
+	{{ end }}
 }
 
 {{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}