gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 15:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

conflict resolution

Browse source
This commit is contained in:
0xdcarns 2022-08-30 10:55:18 -04:00
parent aec456f732
commit 7347085e5e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
logic/server.go
View file

@ -154,7 +154,7 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
return returnNode, err
}
err = wireguard.InitWireguard(node, privateKey, peers.Peers, false)
err = wireguard.InitWireguard(node, privateKey, peers.Peers)
if err != nil {
return returnNode, err
}

2
logic/wireguard.go
View file

@ -140,7 +140,7 @@ func setWGConfig(node *models.Node, peerupdate bool) error {
}
logger.Log(2, "updated peers on server", node.Name)
} else {
err = wireguard.InitWireguard(node, privkey, peers.Peers, false)
err = wireguard.InitWireguard(node, privkey, peers.Peers)
logger.Log(3, "finished setting wg config on server", node.Name)
}
return err