gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +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
Show stats 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"
}
}
if servercfg.IsDNSMode() && node.DNSOn == ""{
node.DNSOn = "yes"
}
node.SetDefaults()
node.Address, err = functions.UniqueAddress(networkName)
if err != nil {
@ -269,9 +271,6 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
//returnErrorResponse(w, r, errorResponse)
return node, err
}
if servercfg.IsDNSMode() {
node.DNSOn = "yes"
}
err = node.Validate(false)
if err != nil {
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.Address6 = c.String("addressIPV6")
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.IsDualStack = c.String("isdualstack")
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,
Interface: cfg.Node.Interface,
PublicKey: cfg.Node.PublicKey,
DNSOn: cfg.Node.DNSOn,
Name: cfg.Node.Name,
Endpoint: cfg.Node.Endpoint,
SaveConfig: cfg.Node.SaveConfig,
@ -118,7 +119,6 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
if err != nil {
return err
}
// Create node on server
res, err := wcclient.CreateNode(
context.TODO(),
@ -152,6 +152,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
}
node.Endpoint = node.LocalAddress
}
err = config.ModConfig(&node)
if err != nil {
return err