MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-25 03:46:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Domain() to return BaseDomain instead of ServerURL hostname

Browse Source 
Co-authored-by: kradalby <98431+kradalby@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-11-01 08:42:24 +00:00
parent abde3ef8b3
commit 43c91c8161
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hscontrol/types/config.go
View File

@@ -246,15 +246,11 @@ func validatePKCEMethod(method string) error {
return nil
}
// Domain returns the hostname/domain part of the ServerURL.
// If the ServerURL is not a valid URL, it returns the BaseDomain.
// Domain returns the base domain for the tailnet.
// This is the domain used for MagicDNS and displayed in Tailscale clients
// as the network name.
func (c *Config) Domain() string {
u, err := url.Parse(c.ServerURL)
if err != nil {
return c.BaseDomain
}
return u.Hostname()
return c.BaseDomain
}
// LoadConfig prepares and loads the Headscale configuration into Viper.