update settings to deprecate oldacls, avoid skipping deleted node update

logic/peers.go

@@ -199,7 +199,9 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 
 		if !node.Connected || node.PendingDelete || node.Action == models.NODE_DELETE ||
 			(!node.LastCheckIn.IsZero() && time.Since(node.LastCheckIn) > time.Hour) {
-			continue
+			if deletedNode == nil || deletedNode.ID != node.ID {
+				continue
+			}
 		}
 		hostPeerUpdate.Nodes = append(hostPeerUpdate.Nodes, node)
 		acls, _ := ListAclsByNetwork(models.NetworkID(node.Network))

migrate/migrate.go

@@ -36,7 +36,6 @@ func Run() {
 	syncUsers()
 	updateHosts()
 	updateNodes()
-	checkAndDeprecateOldAcls()
 	updateAcls()
 	updateNewAcls()
 	logic.MigrateToGws()
@@ -45,6 +44,7 @@ func Run() {
 	migrateNameservers()
 	resync()
 	deleteOldExtclients()
+	checkAndDeprecateOldAcls()
 }
 
 func checkAndDeprecateOldAcls() {
@@ -59,9 +59,13 @@ func checkAndDeprecateOldAcls() {
 		for id, aclNode := range networkACL {
 			if !aclNode.IsAllowed(id) {
 				disableOldAcls = false
+				break
 			}
 		}
-
+		if disableOldAcls {
+			netI.DefaultACL = "yes"
+			logic.UpsertNetwork(netI)
+		}
 	}
 	if disableOldAcls {
 		settings := logic.GetServerSettings()