Merge branch 'main' into embedded-derp

This commit is contained in:
Juan Font Alonso 2022-03-04 00:04:59 +01:00
commit 23cde8445f
12 changed files with 100 additions and 31 deletions

View file

@ -310,6 +310,7 @@ func getHeadscaleConfig() headscale.Config {
return headscale.Config{
ServerURL: viper.GetString("server_url"),
Addr: viper.GetString("listen_addr"),
MetricsAddr: viper.GetString("metrics_listen_addr"),
GRPCAddr: viper.GetString("grpc_listen_addr"),
GRPCAllowInsecure: viper.GetBool("grpc_allow_insecure"),