zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 17:29:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change to single variable in ClientConfig (no nested GlobalSettings).

Browse Source
This commit is contained in:
cameronts
2022-07-28 12:50:53 -07:00
parent 1cb42e8f8b
commit 05283eff14
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netclient/config/config.go
View File

@@ -26,16 +26,11 @@ type ClientConfig struct {
Server models.ServerConfig `yaml:"server"` Server models.ServerConfig `yaml:"server"`
Node models.Node `yaml:"node"` Node models.Node `yaml:"node"`
NetworkSettings models.Network `yaml:"networksettings"` NetworkSettings models.Network `yaml:"networksettings"`
GlobalSettings GlobalSettings `yaml:"globalSettings"`
Network string `yaml:"network"` Network string `yaml:"network"`
Daemon string `yaml:"daemon"` Daemon string `yaml:"daemon"`
OperatingSystem string `yaml:"operatingsystem"` OperatingSystem string `yaml:"operatingsystem"`
AccessKey string `yaml:"accesskey"` AccessKey string `yaml:"accesskey"`
} PublicIPService string `yaml:"publicipservice"`
// GlobalSettings - settings that apply for the netclient across networks
type GlobalSettings struct {
PublicIPService string `yaml:"publicIPService"`
} }
// RegisterRequest - struct for registation with netmaker server // RegisterRequest - struct for registation with netmaker server
@@ -237,7 +232,7 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
cfg.Server.CoreDNSAddr = c.String("corednsaddr") cfg.Server.CoreDNSAddr = c.String("corednsaddr")
cfg.Server.API = c.String("apiserver") cfg.Server.API = c.String("apiserver")
} }
cfg.GlobalSettings.PublicIPService = c.String("publicipservice") cfg.PublicIPService = c.String("publicipservice")
cfg.Node.Name = c.String("name") cfg.Node.Name = c.String("name")
cfg.Node.Interface = c.String("interface") cfg.Node.Interface = c.String("interface")
cfg.Node.Password = c.String("password") cfg.Node.Password = c.String("password")

2
netclient/functions/join.go
View File

@@ -85,7 +85,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
if cfg.Node.IsLocal == "yes" && cfg.Node.LocalAddress != "" { if cfg.Node.IsLocal == "yes" && cfg.Node.LocalAddress != "" {
cfg.Node.Endpoint = cfg.Node.LocalAddress cfg.Node.Endpoint = cfg.Node.LocalAddress
} else { } else {
cfg.Node.Endpoint, err = ncutils.GetPublicIP(cfg.GlobalSettings.PublicIPService) cfg.Node.Endpoint, err = ncutils.GetPublicIP(cfg.PublicIPService)
} }
if err != nil || cfg.Node.Endpoint == "" { if err != nil || cfg.Node.Endpoint == "" {
logger.Log(0, "network:", cfg.Network, "error setting cfg.Node.Endpoint.") logger.Log(0, "network:", cfg.Network, "error setting cfg.Node.Endpoint.")

2
netclient/functions/mqpublish.go
View File

@@ -44,7 +44,7 @@ func checkin() {
nodeCfg.Network = network nodeCfg.Network = network
nodeCfg.ReadConfig() nodeCfg.ReadConfig()
if nodeCfg.Node.IsStatic != "yes" { if nodeCfg.Node.IsStatic != "yes" {
extIP, err := ncutils.GetPublicIP(nodeCfg.GlobalSettings.PublicIPService) extIP, err := ncutils.GetPublicIP(nodeCfg.PublicIPService)
if err != nil { if err != nil {
logger.Log(1, "error encountered checking public ip addresses: ", err.Error()) logger.Log(1, "error encountered checking public ip addresses: ", err.Error())
} }