|
|
|
@ -46,7 +46,6 @@ type Config struct { |
|
|
|
|
GRPCAddr string |
|
|
|
|
GRPCAllowInsecure bool |
|
|
|
|
EphemeralNodeInactivityTimeout time.Duration |
|
|
|
|
NodeUpdateCheckInterval time.Duration |
|
|
|
|
PrefixV4 *netip.Prefix |
|
|
|
|
PrefixV6 *netip.Prefix |
|
|
|
|
IPAllocation IPAllocationStrategy |
|
|
|
@ -233,8 +232,6 @@ func LoadConfig(path string, isFile bool) error { |
|
|
|
|
|
|
|
|
|
viper.SetDefault("ephemeral_node_inactivity_timeout", "120s") |
|
|
|
|
|
|
|
|
|
viper.SetDefault("node_update_check_interval", "10s") |
|
|
|
|
|
|
|
|
|
viper.SetDefault("tuning.batch_change_delay", "800ms") |
|
|
|
|
viper.SetDefault("tuning.node_mapsession_buffered_chan_size", 30) |
|
|
|
|
|
|
|
|
@ -290,15 +287,6 @@ func LoadConfig(path string, isFile bool) error { |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
maxNodeUpdateCheckInterval, _ := time.ParseDuration("60s") |
|
|
|
|
if viper.GetDuration("node_update_check_interval") > maxNodeUpdateCheckInterval { |
|
|
|
|
errorText += fmt.Sprintf( |
|
|
|
|
"Fatal config error: node_update_check_interval (%s) is set too high, must be less than %s", |
|
|
|
|
viper.GetString("node_update_check_interval"), |
|
|
|
|
maxNodeUpdateCheckInterval, |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if errorText != "" { |
|
|
|
|
// nolint
|
|
|
|
|
return errors.New(strings.TrimSuffix(errorText, "\n")) |
|
|
|
@ -714,10 +702,6 @@ func GetHeadscaleConfig() (*Config, error) { |
|
|
|
|
"ephemeral_node_inactivity_timeout", |
|
|
|
|
), |
|
|
|
|
|
|
|
|
|
NodeUpdateCheckInterval: viper.GetDuration( |
|
|
|
|
"node_update_check_interval", |
|
|
|
|
), |
|
|
|
|
|
|
|
|
|
Database: GetDatabaseConfig(), |
|
|
|
|
|
|
|
|
|
TLS: GetTLSConfig(), |
|
|
|
|