diff --git a/ee/server/service/teams.go b/ee/server/service/teams.go index 40a79017e9..5d203ace4e 100644 --- a/ee/server/service/teams.go +++ b/ee/server/service/teams.go @@ -249,6 +249,10 @@ func (svc *Service) ModifyTeam(ctx context.Context, teamID uint, payload fleet.T return nil, err } if macOSMinVersionUpdated { + if err := svc.mdmAppleEditedMacOSUpdates(ctx, &team.ID, team.Config.MDM.MacOSUpdates); err != nil { + return nil, ctxerr.Wrap(ctx, err, "update DDM profile on macOS updates change") + } + if err := svc.ds.NewActivity( ctx, authz.UserFromContext(ctx), @@ -984,8 +988,10 @@ func (svc *Service) editTeamFromSpec( return err } team.Config.Features = features + var mdmMacOSUpdatesEdited bool if spec.MDM.MacOSUpdates.Deadline.Set || spec.MDM.MacOSUpdates.MinimumVersion.Set { team.Config.MDM.MacOSUpdates = spec.MDM.MacOSUpdates + mdmMacOSUpdatesEdited = true } if spec.MDM.WindowsUpdates.DeadlineDays.Set || spec.MDM.WindowsUpdates.GracePeriodDays.Set { team.Config.MDM.WindowsUpdates = spec.MDM.WindowsUpdates @@ -1165,6 +1171,12 @@ func (svc *Service) editTeamFromSpec( } } + if mdmMacOSUpdatesEdited { + if err := svc.mdmAppleEditedMacOSUpdates(ctx, &team.ID, team.Config.MDM.MacOSUpdates); err != nil { + return err + } + } + return nil } diff --git a/server/service/appconfig.go b/server/service/appconfig.go index b2457d772d..fb5fca4102 100644 --- a/server/service/appconfig.go +++ b/server/service/appconfig.go @@ -556,6 +556,10 @@ func (svc *Service) ModifyAppConfig(ctx context.Context, p []byte, applyOpts fle // activity if oldAppConfig.MDM.MacOSUpdates.MinimumVersion.Value != appConfig.MDM.MacOSUpdates.MinimumVersion.Value || oldAppConfig.MDM.MacOSUpdates.Deadline.Value != appConfig.MDM.MacOSUpdates.Deadline.Value { + if err := svc.EnterpriseOverrides.MDMAppleEditedMacOSUpdates(ctx, nil, appConfig.MDM.MacOSUpdates); err != nil { + return nil, ctxerr.Wrap(ctx, err, "update DDM profile after macOS updates change") + } + if err := svc.ds.NewActivity( ctx, authz.UserFromContext(ctx),