Merge remote-tracking branch 'upstream/develop' into BigRefactor

This commit is contained in:
redanthrax 2022-06-27 11:14:58 -07:00
commit a8dfa19b3a
9 changed files with 43 additions and 10 deletions

View file

@ -154,6 +154,8 @@ func NewAgentConfig() *rmm.AgentConfig {
Cert: viper.GetString("cert"),
Proxy: viper.GetString("proxy"),
CustomMeshDir: viper.GetString("meshdir"),
NatsProxyPath: viper.GetString("natsproxypath"),
NatsProxyPort: viper.GetString("natsproxyport"),
}
return ret
}