gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-25 00:24:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #145 from gravitl/develop

Browse source 
Develop
This commit is contained in:
Alex 2021-05-06 13:27:55 -04:00 committed by GitHub
commit fd171c5a70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
controllers/common.go
View file

@ -8,6 +8,7 @@ import (
"time"
"github.com/gravitl/netmaker/functions"
"github.com/gravitl/netmaker/servercfg"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/mongoconn"
"go.mongodb.org/mongo-driver/bson"
@ -306,6 +307,9 @@ func UpdateNode(nodechange models.Node, node models.Node) (models.Node, error) {
if notifynetwork {
errN = SetNetworkNodesLastModified(queryNetwork)
}
if servercfg.IsDNSMode() {
errN = SetDNS()
}
return returnnode, errN
}
@ -332,6 +336,9 @@ func DeleteNode(macaddress string, network string) (bool, error) {
err = SetNetworkNodesLastModified(network)
fmt.Println("Deleted node " + macaddress + " from network " + network)
if servercfg.IsDNSMode() {
err = SetDNS()
}
return deleted, err
}
@ -421,7 +428,9 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
}
SetNetworkNodesLastModified(node.Network)
if servercfg.IsDNSMode() {
err = SetDNS()
}
return node, err
}

6
controllers/nodeGrpcController.go
View file

@ -60,7 +60,7 @@ func (s *NodeServiceServer) ReadNode(ctx context.Context, req *nodepb.ReadNodeRe
Postdown: node.PostDown,
Postup: node.PostUp,
Checkininterval: node.CheckInInterval,
Dnsoff: servercfg.IsDNSMode(),
Dnsoff: !servercfg.IsDNSMode(),
Ispending: node.IsPending,
Publickey: node.PublicKey,
Listenport: node.ListenPort,
@ -159,7 +159,7 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.CreateNo
Password: node.Password,
Interface: node.Interface,
Nodenetwork: node.Network,
Dnsoff: servercfg.IsDNSMode(),
Dnsoff: !servercfg.IsDNSMode(),
Ispending: node.IsPending,
Publickey: node.PublicKey,
Listenport: node.ListenPort,
@ -300,7 +300,7 @@ func (s *NodeServiceServer) UpdateNode(ctx context.Context, req *nodepb.UpdateNo
Nodenetwork: newnode.Network,
Ispending: newnode.IsPending,
Publickey: newnode.PublicKey,
Dnsoff: servercfg.IsDNSMode(),
Dnsoff: !servercfg.IsDNSMode(),
Listenport: newnode.ListenPort,
Keepalive: newnode.PersistentKeepalive,
Islocal: localvar,

2
functions/local.go
View file

@ -31,8 +31,8 @@ func SetCorefile(domains string) error {
}
corefile := domains + ` {
reload 15s
hosts /root/dnsconfig/netmaker.hosts {
reload 15s
fallthrough
}
forward . 8.8.8.8 8.8.4.4