mirror of
https://github.com/gravitl/netmaker.git
synced 2025-02-27 09:36:08 +08:00
added hotfixes
This commit is contained in:
parent
90463dd1d7
commit
ec8d9baa29
2 changed files with 3 additions and 1 deletions
|
@ -395,10 +395,11 @@ func GetNodeByIDorMacAddress(uuid string, macaddress string, network string) (mo
|
||||||
return models.Node{}, err
|
return models.Node{}, err
|
||||||
}
|
}
|
||||||
err = CreateNode(&node)
|
err = CreateNode(&node)
|
||||||
logger.Log(2, "rewriting legacy node data; node now has id,", node.ID)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return models.Node{}, err
|
return models.Node{}, err
|
||||||
}
|
}
|
||||||
|
logger.Log(2, "rewriting legacy node data; node now has id,", node.ID)
|
||||||
|
node.PullChanges = "yes"
|
||||||
}
|
}
|
||||||
return node, err
|
return node, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,6 +108,7 @@ func CreateNode(node *models.Node) error {
|
||||||
if node.IsServer != "yes" || (node.IsServer == "yes" && servercfg.GetNodeID() == "") {
|
if node.IsServer != "yes" || (node.IsServer == "yes" && servercfg.GetNodeID() == "") {
|
||||||
node.ID = uuid.NewString()
|
node.ID = uuid.NewString()
|
||||||
}
|
}
|
||||||
|
logger.Log(0, "server ID: ", node.ID)
|
||||||
|
|
||||||
//Create a JWT for the node
|
//Create a JWT for the node
|
||||||
tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network)
|
tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network)
|
||||||
|
|
Loading…
Reference in a new issue