Merge master

This commit is contained in:
Kristoffer Dalby
2022-05-16 21:41:46 +02:00
44 changed files with 2714 additions and 842 deletions

View File

@@ -177,8 +177,10 @@ func (h *Headscale) SetMachineNamespace(machine *Machine, namespaceName string)
if err != nil {
return err
}
machine.NamespaceID = namespace.ID
h.db.Save(&machine)
machine.Namespace = *namespace
if result := h.db.Save(&machine); result.Error != nil {
return result.Error
}
return nil
}