Browse Source

remove corednsAddrr from token

Matthew R. Kasun 3 years ago
parent
commit
7e9f65ad1b
4 changed files with 4 additions and 5 deletions
  1. 0 1
      logic/accesskeys.go
  2. 0 1
      models/accessToken.go
  3. 0 1
      netclient/config/config.go
  4. 4 2
      servercfg/serverconf.go

+ 0 - 1
logic/accesskeys.go

@@ -52,7 +52,6 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 	var accessToken models.AccessToken
 	s := servercfg.GetServerConfig()
 	servervals := models.ServerConfig{
-		CoreDNSAddr:     s.CoreDNSAddr,
 		GRPCConnString:  s.GRPCConnString,
 		GRPCSSL:         s.GRPCSSL,
 		CheckinInterval: s.CheckinInterval,

+ 0 - 1
models/accessToken.go

@@ -12,7 +12,6 @@ type ClientConfig struct {
 }
 
 type ServerConfig struct {
-	CoreDNSAddr     string `json:"corednsaddr"`
 	GRPCConnString  string `json:"grpcconn"`
 	GRPCSSL         string `json:"grpcssl"`
 	CheckinInterval string `json:"checkininterval"`

+ 0 - 1
netclient/config/config.go

@@ -184,7 +184,6 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 		cfg.Node.LocalRange = accesstoken.ClientConfig.LocalRange
 		cfg.Server.GRPCSSL = accesstoken.ServerConfig.GRPCSSL
 		cfg.Server.CheckinInterval = accesstoken.ServerConfig.CheckinInterval
-		cfg.Server.CoreDNSAddr = accesstoken.ServerConfig.CoreDNSAddr
 		if c.String("grpcserver") != "" {
 			cfg.Server.GRPCAddress = c.String("grpcserver")
 		}

+ 4 - 2
servercfg/serverconf.go

@@ -207,6 +207,8 @@ func GetGRPCConnString() string {
 		conn = os.Getenv("SERVER_GRPC_CONN_STRING")
 	} else if config.Config.Server.GRPCConnString != "" {
 		conn = config.Config.Server.GRPCConnString
+	} else {
+		conn = config.Config.Server.GRPCHost + ":" + config.Config.Server.GRPCPort
 	}
 	return conn
 }
@@ -414,8 +416,8 @@ func IsGRPCSSL() bool {
 		if os.Getenv("GRPC_SSL") == "on" {
 			isssl = true
 		}
-	} else if config.Config.Server.DNSMode != "" {
-		if config.Config.Server.DNSMode == "on" {
+	} else if config.Config.Server.GRPCSSL != "" {
+		if config.Config.Server.GRPCSSL == "on" {
 			isssl = true
 		}
 	}