Преглед изворни кода

Merge branch 'ACC-638' of https://github.com/gravitl/netmaker into ACC-638

abhishek9686 пре 1 година
родитељ
комит
a74d92b5e1
2 измењених фајлова са 8 додато и 1 уклоњено
  1. 4 1
      pro/remote_access_client.go
  2. 4 0
      scripts/netmaker.default.env

+ 4 - 1
pro/remote_access_client.go

@@ -47,7 +47,10 @@ func racAutoDisableHook() error {
 			continue
 		}
 		for _, client := range clients {
-			if (client.OwnerID == user.UserName) && !user.IsAdmin && !user.IsSuperAdmin && client.Enabled {
+			if (client.OwnerID == user.UserName) &&
+				user.PlatformRoleID != models.SuperAdminRole &&
+				user.PlatformRoleID != models.AdminRole &&
+				client.Enabled {
 				slog.Info(fmt.Sprintf("disabling ext client %s for user %s due to RAC autodisabling", client.ClientID, client.OwnerID))
 				if err := disableExtClient(&client); err != nil {
 					slog.Error("error disabling ext client in RAC autodisable hook", "error", err)

+ 4 - 0
scripts/netmaker.default.env

@@ -86,4 +86,8 @@ EMAIL_SENDER_ADDR=
 EMAIL_SENDER_USER=
 # sender smtp password
 EMAIL_SENDER_PASSWORD=
+# if batch peer update enable or not
+PEER_UPDATE_BATCH=true
+# batch peer update size when PEER_UPDATE_BATCH is enabled
+PEER_UPDATE_BATCH_SIZE=50