fix(router): resolve golang template scoping issue

Author: Gabriel Monroy

router/templates/nginx.conf

@@ -21,16 +21,14 @@ http {
 
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
-
     {{ if .deis_router_gzip }}
     gzip {{ .deis_router_gzip }};
     gzip_comp_level {{ .deis_router_gzipCompLevel }};
     gzip_disable {{ .deis_router_gzipDisable }};
     gzip_http_version {{ .deis_router_gzipHttpVersion }};
     gzip_types {{ .deis_router_gzipTypes }};
     gzip_proxied {{ .deis_router_gzipProxied }};
-    gzip_vary {{ .deis_router_gzipVary }};
-    {{ end }}
+    gzip_vary {{ .deis_router_gzipVary }};{{ end }}
 
     # send logs to STDOUT so they can be seen using 'docker logs'
     access_log /dev/stdout;
@@ -43,15 +41,14 @@ http {
     }
 
     # service definitions for each application
-
-    {{ range $service := .deis_services }}{{ if $service.Nodes }}
+    {{ $domains := .deis_domains }}{{ range $service := .deis_services }}{{ if $service.Nodes }}
     upstream {{ Base $service.Key }} {
         {{ range $upstream := $service.Nodes }}server {{ $upstream.Value }};
         {{ end }}
     }
 
     server {
-        server_name ~^{{ Base $service.Key }}\.(?<domain>.+)${{ range $domains := .deis_domains }}{{range $app_domains := $domains.Nodes }}{{ if eq (Base $service.Key) (Base $app_domains) }} {{ $app_domains.Value }}{{ end }}{{ end }}{{ end }};
+        server_name ~^{{ Base $service.Key }}\.(?<domain>.+)${{ range $app_domains := $domains }}{{ if eq (Base $service.Key) (Base $app_domains.Key) }} {{ $app_domains.Value }}{{ end }}{{ end }};
 
         server_name_in_redirect off;
         port_in_redirect off;