Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-10-28 10:51:44 +01:00
Code Issues Projects Releases Wiki Activity

use headscale server url as domain instead of base_domain (#2338)

Browse Source
This commit is contained in:
Kristoffer Dalby 2025-01-16 18:05:20 +01:00 committed by GitHub
parent caad5c613d
commit e4a3dcc3b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hscontrol/mapper/mapper.go
View File

@ -105,8 +105,7 @@ func generateUserProfiles(
var profiles []tailcfg.UserProfile var profiles []tailcfg.UserProfile
for _, user := range userMap { for _, user := range userMap {
profiles = append(profiles, profiles = append(profiles, user.TailscaleUserProfile())
user.TailscaleUserProfile())
} }
return profiles return profiles
@ -455,7 +454,7 @@ func (m *Mapper) baseWithConfigMapResponse(
resp.DERPMap = m.derpMap resp.DERPMap = m.derpMap
resp.Domain = m.cfg.BaseDomain resp.Domain = m.cfg.Domain()
// Do not instruct clients to collect services we do not // Do not instruct clients to collect services we do not
// support or do anything with them // support or do anything with them

11
hscontrol/types/config.go
View File

@ -242,6 +242,17 @@ func validatePKCEMethod(method string) error {
return nil return nil
} }
// Domain returns the hostname/domain part of the ServerURL.
// If the ServerURL is not a valid URL, it returns the BaseDomain.
func (c *Config) Domain() string {
u, err := url.Parse(c.ServerURL)
if err != nil {
return c.BaseDomain
}
return u.Hostname()
}
// LoadConfig prepares and loads the Headscale configuration into Viper. // LoadConfig prepares and loads the Headscale configuration into Viper.
// This means it sets the default values, reads the configuration file and // This means it sets the default values, reads the configuration file and
// environment variables, and handles deprecated configuration options. // environment variables, and handles deprecated configuration options.