From 3aaf83d04dc701583def61cb6618a23d41a69b81 Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Mon, 31 Jan 2022 11:25:05 -0500 Subject: [PATCH] sync conf --- controllers/node_grpc.go | 6 ++++++ netclient/functions/daemon.go | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/controllers/node_grpc.go b/controllers/node_grpc.go index f9c498db..76fe1bb7 100644 --- a/controllers/node_grpc.go +++ b/controllers/node_grpc.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "strings" + "time" nodepb "github.com/gravitl/netmaker/grpc" "github.com/gravitl/netmaker/logger" @@ -98,6 +99,11 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object) if err != nil { return nil, err } + network.NodesLastModified = time.Now().Unix() + network.DefaultServerAddrs = node.NetworkSettings.DefaultServerAddrs + if err := logic.SaveNetwork(&network); err != nil { + return nil, err + } err = runServerPeerUpdate(node.Network, isServer(&node), "node_grpc create") if err != nil { logger.Log(1, "internal error when setting peers after node,", node.ID, "was created (gRPC)") diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go index ea3e7ecc..0f76770f 100644 --- a/netclient/functions/daemon.go +++ b/netclient/functions/daemon.go @@ -285,10 +285,10 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) { ncutils.Log("error updating wireguard peers" + err.Error()) return } - ncutils.Log("applyWGQuickConf to " + file) - err = wireguard.ApplyWGQuickConf(file) + ncutils.Log("syncing conf to " + file) + err = wireguard.SyncWGQuickConf(cfg.Node.Interface, file) if err != nil { - ncutils.Log("error restarting wg after peer update " + err.Error()) + ncutils.Log("error syncing wg after peer update " + err.Error()) return } }