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

fixing dns setting on netclient

Browse Source
This commit is contained in:
afeiszli
2021-09-29 10:02:34 -04:00
parent 5d786740d7
commit 1661f3dabf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/common.go
View File

@@ -253,7 +253,9 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
node.IsServer = "yes" node.IsServer = "yes"
} }
} }
if servercfg.IsDNSMode() && node.DNSOn == ""{
node.DNSOn = "yes"
}
node.SetDefaults() node.SetDefaults()
node.Address, err = functions.UniqueAddress(networkName) node.Address, err = functions.UniqueAddress(networkName)
if err != nil { if err != nil {
@@ -269,9 +271,6 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
//returnErrorResponse(w, r, errorResponse) //returnErrorResponse(w, r, errorResponse)
return node, err return node, err
} }
if servercfg.IsDNSMode() {
node.DNSOn = "yes"
}
err = node.Validate(false) err = node.Validate(false)
if err != nil { if err != nil {
return node, err return node, err

2
netclient/config/config.go
View File

@@ -282,7 +282,7 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
cfg.Node.Address = c.String("address") cfg.Node.Address = c.String("address")
cfg.Node.Address6 = c.String("addressIPV6") cfg.Node.Address6 = c.String("addressIPV6")
cfg.Node.Roaming = c.String("roaming") cfg.Node.Roaming = c.String("roaming")
cfg.Node.DNSOn = c.String("dns") cfg.Node.DNSOn = c.String("dnson")
cfg.Node.IsLocal = c.String("islocal") cfg.Node.IsLocal = c.String("islocal")
cfg.Node.IsDualStack = c.String("isdualstack") cfg.Node.IsDualStack = c.String("isdualstack")
cfg.Node.PostUp = c.String("postup") cfg.Node.PostUp = c.String("postup")

3
netclient/functions/join.go
View File

@@ -105,6 +105,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
LocalAddress: cfg.Node.LocalAddress, LocalAddress: cfg.Node.LocalAddress,
Interface: cfg.Node.Interface, Interface: cfg.Node.Interface,
PublicKey: cfg.Node.PublicKey, PublicKey: cfg.Node.PublicKey,
DNSOn: cfg.Node.DNSOn,
Name: cfg.Node.Name, Name: cfg.Node.Name,
Endpoint: cfg.Node.Endpoint, Endpoint: cfg.Node.Endpoint,
SaveConfig: cfg.Node.SaveConfig, SaveConfig: cfg.Node.SaveConfig,
@@ -118,7 +119,6 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
if err != nil { if err != nil {
return err return err
} }
// Create node on server // Create node on server
res, err := wcclient.CreateNode( res, err := wcclient.CreateNode(
context.TODO(), context.TODO(),
@@ -152,6 +152,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
} }
node.Endpoint = node.LocalAddress node.Endpoint = node.LocalAddress
} }
err = config.ModConfig(&node) err = config.ModConfig(&node)
if err != nil { if err != nil {
return err return err