Make get config load the config, use config in main method

This commit is contained in:
Kristoffer Dalby 2022-06-05 17:47:12 +02:00
parent c3db5ed749
commit af891808f6
3 changed files with 24 additions and 16 deletions

View file

@ -376,7 +376,12 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) {
return nil, ""
}
func GetHeadscaleConfig() Config {
func GetHeadscaleConfig() (*Config, error) {
err := LoadConfig("")
if err != nil {
return nil, err
}
dnsConfig, baseDomain := GetDNSConfig()
derpConfig := GetDERPConfig()
logConfig := GetLogTailConfig()
@ -435,7 +440,7 @@ func GetHeadscaleConfig() Config {
Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes)
}
return Config{
return &Config{
ServerURL: viper.GetString("server_url"),
Addr: viper.GetString("listen_addr"),
MetricsAddr: viper.GetString("metrics_listen_addr"),
@ -495,5 +500,5 @@ func GetHeadscaleConfig() Config {
},
ACL: GetACLConfig(),
}
}, nil
}