homelab/traefik
1
0
Fork 0
Code Activity

Remove the trailing dot if the domain is not defined.

Browse source
This commit is contained in:
Ludovic Fernandez 2018-10-23 17:36:05 +02:00 • committed by Traefiker Bot
parent 638960284e
commit c7df82e695
8 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
provider/marathon/config.go
View file

@ -214,11 +214,14 @@ func (p *Provider) getFrontendRule(app appData) string {
}
domain := label.GetStringValue(app.SegmentLabels, label.TraefikDomain, p.Domain)
if len(domain) > 0 {
domain = "." + domain
}
if len(app.SegmentName) > 0 {
return "Host:" + strings.ToLower(provider.Normalize(app.SegmentName)) + "." + p.getSubDomain(app.ID) + "." + domain
return "Host:" + strings.ToLower(provider.Normalize(app.SegmentName)) + "." + p.getSubDomain(app.ID) + domain
}
return "Host:" + p.getSubDomain(app.ID) + "." + domain
return "Host:" + p.getSubDomain(app.ID) + domain
}
func getPort(task marathon.Task, app appData) string {