diff --git a/netclient/config/config.go b/netclient/config/config.go index e5c31b85..714c40ab 100644 --- a/netclient/config/config.go +++ b/netclient/config/config.go @@ -26,16 +26,11 @@ type ClientConfig struct { Server models.ServerConfig `yaml:"server"` Node models.Node `yaml:"node"` NetworkSettings models.Network `yaml:"networksettings"` - GlobalSettings GlobalSettings `yaml:"globalSettings"` Network string `yaml:"network"` Daemon string `yaml:"daemon"` OperatingSystem string `yaml:"operatingsystem"` AccessKey string `yaml:"accesskey"` -} - -// GlobalSettings - settings that apply for the netclient across networks -type GlobalSettings struct { - PublicIPService string `yaml:"publicIPService"` + PublicIPService string `yaml:"publicipservice"` } // 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.API = c.String("apiserver") } - cfg.GlobalSettings.PublicIPService = c.String("publicipservice") + cfg.PublicIPService = c.String("publicipservice") cfg.Node.Name = c.String("name") cfg.Node.Interface = c.String("interface") cfg.Node.Password = c.String("password") diff --git a/netclient/functions/join.go b/netclient/functions/join.go index 13a4797e..2695ff12 100644 --- a/netclient/functions/join.go +++ b/netclient/functions/join.go @@ -85,7 +85,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error { if cfg.Node.IsLocal == "yes" && cfg.Node.LocalAddress != "" { cfg.Node.Endpoint = cfg.Node.LocalAddress } else { - cfg.Node.Endpoint, err = ncutils.GetPublicIP(cfg.GlobalSettings.PublicIPService) + cfg.Node.Endpoint, err = ncutils.GetPublicIP(cfg.PublicIPService) } if err != nil || cfg.Node.Endpoint == "" { logger.Log(0, "network:", cfg.Network, "error setting cfg.Node.Endpoint.") diff --git a/netclient/functions/mqpublish.go b/netclient/functions/mqpublish.go index 4757db47..a53756e9 100644 --- a/netclient/functions/mqpublish.go +++ b/netclient/functions/mqpublish.go @@ -44,7 +44,7 @@ func checkin() { nodeCfg.Network = network nodeCfg.ReadConfig() if nodeCfg.Node.IsStatic != "yes" { - extIP, err := ncutils.GetPublicIP(nodeCfg.GlobalSettings.PublicIPService) + extIP, err := ncutils.GetPublicIP(nodeCfg.PublicIPService) if err != nil { logger.Log(1, "error encountered checking public ip addresses: ", err.Error()) }