mirror of
https://github.com/juanfont/headscale.git
synced 2025-01-18 18:00:04 +09:00
use headscale server url as domain instead of base_domain (#2338)
Some checks are pending
Build / build-nix (push) Waiting to run
Build / build-cross (GOARCH=386 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=5) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=6) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=7) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=linux) (push) Waiting to run
Tests / test (push) Waiting to run
Some checks are pending
Build / build-nix (push) Waiting to run
Build / build-cross (GOARCH=386 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=5) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=6) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=7) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=linux) (push) Waiting to run
Tests / test (push) Waiting to run
This commit is contained in:
parent
caad5c613d
commit
e4a3dcc3b8
2 changed files with 13 additions and 3 deletions
|
@ -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
|
||||||
|
|
|
@ -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.
|
||||||
|
|
Loading…
Reference in a new issue