fix server-alias on http/80

jcmoraisjr · May 5, 2020 · 8ecf15a · 8ecf15a
1 parent ae30511
commit 8ecf15a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/haproxy/config.go b/pkg/haproxy/config.go
@@ -385,6 +385,8 @@ func (c *config) BuildFrontendGroup() error {
 				}
 				if !hasSSLRedirect || c.global.Bind.HasFrontingProxy() {
 					fgroup.HTTPFrontsMap.AppendHostname(base, back)
+					fgroup.HTTPFrontsMap.AppendAliasName(aliasName, back)
+					fgroup.HTTPFrontsMap.AppendAliasRegex(aliasRegex, back)
 				}
 				var ns string
 				if host.VarNamespace {

diff --git a/pkg/haproxy/instance_test.go b/pkg/haproxy/instance_test.go
@@ -1832,7 +1832,15 @@ backend d3_app_8080
     mode http
     server s31 172.17.0.131:8080 weight 100
 <<backends-default>>
-<<frontend-http>>
+frontend _front_http
+    mode http
+    bind :80
+    http-request set-var(req.base) base,lower,regsub(:[0-9]+/,/)
+    http-request redirect scheme https if { var(req.base),map_beg(/etc/haproxy/maps/_global_https_redir.map,_nomatch) yes }
+    <<http-headers>>
+    http-request set-var(req.backend) var(req.base),map_beg(/etc/haproxy/maps/_global_http_front.map,_nomatch)
+    http-request set-var(req.backend) var(req.base),map_reg(/etc/haproxy/maps/_global_http_front_regex.map,_nomatch) if { var(req.backend) _nomatch }
+    use_backend %[var(req.backend)] unless { var(req.backend) _nomatch }
     default_backend _error404
 frontend _front001
     mode http
@@ -1854,6 +1862,7 @@ d3.local/ no
 	c.checkMap("_global_http_front.map", `
 d1.local/ d1_app_8080
 d2.local/ d2_app_8080
+sub.d2.local/ d2_app_8080
 d3.local/ d3_app_8080
 `)
 	c.checkMap("_front001_host.map", `