Commit4a07fcd

authored

fix: ensure local derp uses the hostname (#6559)

This broke deployments that use a custom port with an accessURL. We should write a test for this!

1 parent8b125d6 commit4a07fcdCopy full SHA for 4a07fcd

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ flags, and YAML configuration. The precedence is as follows:`
`621`	`621`	`Nodes: []*tailcfg.DERPNode{{`
`622`	`622`	`Name:fmt.Sprintf("%db",cfg.DERP.Server.RegionID),`
`623`	`623`	`RegionID:int(cfg.DERP.Server.RegionID.Value()),`
`624`		`-HostName:cfg.AccessURL.Host,`
	`624`	`+HostName:cfg.AccessURL.Value().Hostname(),`
`625`	`625`	`DERPPort:accessURLPort,`
`626`	`626`	`STUNPort:-1,`
`627`	`627`	`ForceHTTP:cfg.AccessURL.Scheme=="http",`

Comments

(0)