Merge pull request #238 from ehazlett/nginx-ssl-template-fix

Fix issue with SSL only in nginx
ehazlett · Jul 31, 2017 · f6ccc1f · f6ccc1f
2 parents 3e832e8 + 5f817fe
commit f6ccc1f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/ext/lb/nginx/template.go b/ext/lb/nginx/template.go
@@ -121,9 +121,9 @@ http {
             stub_status on;
             access_log off;
         }
-
         {{ end }}
     }
+
     {{ if $host.SSL }}
     server {
         listen {{ $host.SSLPort }};
@@ -155,6 +155,8 @@ http {
     {{ end }}
     {{ end }} {{/* end host range */}}
 
+    }
+
     include {{ .Config.ConfigBasePath }}/conf.d/*.conf;
 }
 `
diff --git a/ext/lb/nginx/template_nginxplus.go b/ext/lb/nginx/template_nginxplus.go
@@ -134,7 +134,6 @@ http {
             stub_status on;
             access_log off;
         }
-
         {{ end }}
     }
     {{ if $host.SSL }}
@@ -168,6 +167,8 @@ http {
     {{ end }}
     {{ end }} {{/* end host range */}}
 
+    }
+
     include {{ .Config.ConfigBasePath }}/conf.d/*.conf;
 }
 `
diff --git a/ext/lb/utils/network.go b/ext/lb/utils/network.go
@@ -82,12 +82,17 @@ func BackendAddress(cnt types.Container, backendOverrideAddress string) (string,
 		}
 		for _, port := range ports {
 			if port.PrivatePort == uint16(interlockPort) {
+				portDef.HostIP = port.IP
 				portDef.HostPort = fmt.Sprintf("%d", port.PublicPort)
 				break
 			}
 		}
 	}
 
+	if portDef.HostIP == "" || portDef.HostPort == "" {
+		return "", fmt.Errorf("unable to find ip or exposed port: %+v", portDef)
+	}
+
 	addr = fmt.Sprintf("%s:%s", portDef.HostIP, portDef.HostPort)
 	return addr, nil
 }
diff --git a/version/version.go b/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 var (
-	Version = "1.4.1"
+	Version = "1.4.2"
 
 	// Build will be overwritten automatically by the build system
 	Build = "-dev"