Small tweaks to default.yml template for fleetctl new (#42239)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** For #41345

* Adds a missing comment delimiter
* Adds required `organization_name` to `apple_business_manager` section
* Adds required `location` to `volume_purchasing_program ` section
* Adds Windows MDM section with `windows_enabled_and_configured`,
required for the Windows OS update settings to work

---------

Co-authored-by: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>
This commit is contained in:
Scott Gress 2026-03-24 08:42:48 -05:00 committed by GitHub
parent 64777a7e07
commit 994843f330
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -55,7 +55,7 @@ org_settings:
# • https://fleetdm.com/guides/setup-experience#end-user-authentication
###########################################################
# end_user_authentication:
# idp_name: "Okta" e.g. "Entra", "Okta", "Google Workspace", etc. (Displayed to end users.)
# idp_name: "Okta" # e.g. "Entra", "Okta", "Google Workspace", etc. (Displayed to end users.)
# metadata_url: "https://okta.com/replace-this-url" # This must exactly match the "IdP metadata URL" provided by your identity provider (IdP) when setting up this integration.
# entity_id: "fleet-end-users" # This must exactly match the "Entity ID" field you chose when setting up this integration in your identity provider (IdP).
@ -68,7 +68,8 @@ org_settings:
# • https://fleetdm.com/guides/apple-mdm-setup#apple-business-manager-abm
###########################################################
# apple_business_manager:
# - macos_fleet: "💻 Workstations" # Where new macOS devices from ABM will appear
# - organization_name: "My Company, Inc." # This must exactly match the organization name in Apple Business Manager (ABM).
# macos_fleet: "💻 Workstations" # Where new macOS devices from ABM will appear
###########################################################
# Uncomment to start using Apple's volume purchase program (VPP)
@ -80,7 +81,8 @@ org_settings:
# • https://fleetdm.com/guides/apple-mdm-setup#volume-purchasing-program-vpp
###########################################################
# volume_purchasing_program:
# - fleets:
# - location: "My location." # This must exactly match a "Location" name in Apple Business Manager (ABM).
# fleets:
# - "💻 Workstations"
# - "📱🔐 Personal mobile devices"
@ -104,6 +106,14 @@ controls:
# # By convention it looks up the device and unmanages it in the old MDM,
# # then enrolls the device in Fleet. Unsure? Get help @ fleetdm.com/support.
###########################################################
# Uncomment when you are ready to start using Fleet's Windows MDM features.
#
# Read more:
# • https://fleetdm.com/guides/windows-mdm-setup
###########################################################
# windows_enabled_and_configured: true
###########################################################
# Labels are static or dynamic groupings of computers for