Merge pull request #144 from gravitl/feature_v0.3_installer-updates

hotfixing dns

controllers/common.go

@@ -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
 }
 

controllers/nodeGrpcController.go

@@ -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,

functions/local.go

@@ -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