mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
conflict resolution
This commit is contained in:
parent
aec456f732
commit
7347085e5e
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue