myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Make config get function global

Browse source
This commit is contained in:
Kristoffer Dalby 2022-05-31 12:49:41 +02:00
parent 3e078f0494
commit 5bfae22c8f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/headscale/cli/utils.go
View file

@ -277,7 +277,7 @@ func absPath(path string) string {
return path return path
} }
func getHeadscaleConfig() headscale.Config { func GetHeadscaleConfig() headscale.Config {
dnsConfig, baseDomain := GetDNSConfig() dnsConfig, baseDomain := GetDNSConfig()
derpConfig := GetDERPConfig() derpConfig := GetDERPConfig()
logConfig := GetLogTailConfig() logConfig := GetLogTailConfig()
@ -416,7 +416,7 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
return nil, err return nil, err
} }
cfg := getHeadscaleConfig() cfg := GetHeadscaleConfig()
app, err := headscale.NewHeadscale(cfg) app, err := headscale.NewHeadscale(cfg)
if err != nil { if err != nil {
@ -440,7 +440,7 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
} }
func getHeadscaleCLIClient() (context.Context, v1.HeadscaleServiceClient, *grpc.ClientConn, context.CancelFunc) { func getHeadscaleCLIClient() (context.Context, v1.HeadscaleServiceClient, *grpc.ClientConn, context.CancelFunc) {
cfg := getHeadscaleConfig() cfg := GetHeadscaleConfig()
log.Debug(). log.Debug().
Dur("timeout", cfg.CLI.Timeout). Dur("timeout", cfg.CLI.Timeout).