Merge pull request #3505 from gravitl/v0.99_fixes

V0.99 fixes

controllers/node.go

@@ -178,7 +178,7 @@ func Authorize(
 			// check if host instead of user
 			if hostAllowed {
 				// TODO --- should ensure that node is only operating on itself
-				if hostID, macAddr, _, err := logic.VerifyHostToken(authToken); err == nil && macAddr != "" {
+				if hostID, _, _, err := logic.VerifyHostToken(authToken); err == nil {
 					r.Header.Set(hostIDHeader, hostID)
 					// this indicates request is from a node
 					// used for failover - if a getNode comes from node, this will trigger a metrics wipe

migrate/migrate.go

@@ -581,7 +581,7 @@ func settings() {
 	}
 	settings := logic.GetServerSettings()
 	if settings.AuditLogsRetentionPeriodInDays == 0 {
-		settings.AuditLogsRetentionPeriodInDays = 30
+		settings.AuditLogsRetentionPeriodInDays = 7
 	}
 	if settings.DefaultDomain == "" {
 		settings.DefaultDomain = servercfg.GetDefaultDomain()