Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions articles/setup-experience.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ macOS setup features require [connecting Fleet to Apple Business Manager (ABM)](

> If a host is marked with a [migration deadline](https://support.apple.com/en-bh/guide/apple-business-manager/axm3a49a769d/web#axmf524b36d9) in Apple Business Manager, Fleet treats it as already set up. This means Fleet won’t install setup experience software, run scripts, or install bootstrap packages on that host.

Below is the end user experience for macOS. Check out the separate videos for [iOS](https://www.youtube.com/watch?v=bPtr3Qgp1JY), [iPadOS](https://www.youtube.com/watch?v=sK3ZR2iItJY), and [Android](https://www.youtube.com/watch?v=-zB1zgtGAMs).

<div purpose="embedded-content">
<iframe src="https://www.youtube.com/embed/BU0Q_8cQXuw?si=2N6abC9y1mEpFlzI" frameborder="0" allowfullscreen></iframe>
</div>

## End user authentication

You can enforce end user authentication during automatic enrollment (ADE) for Apple (macOS, iOS, iPadOS) hosts and manual enrollment for personal (BYOD) iOS, iPadOS, and Android hosts. End user authentication is also supported on [Windows and Linux](https://fleetdm.com/guides/windows-linux-setup-experience). End users can use passkeys, such as YubiKeys, with macOS hosts during the authentication process.
Expand Down
8 changes: 7 additions & 1 deletion articles/windows-linux-setup-experience.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ Here's what you can configure, and in what order each happen, to your Windows an

1. Require [end users to authenticate](#end-user-authentication) with your identity provider (IdP).

2. [Install software](#install-software) including [app store apps](https://fleetdm.com/guides/install-app-store-apps), [custom packages](https://fleetdm.com/guides/deploy-software-packages) (e.g. a bootstrap package), and [Fleet-maintained apps](https://fleetdm.com/guides/fleet-maintained-apps).
2. [Install software](#install-software) including [app store apps](https://fleetdm.com/guides/install-app-store-apps), [custom packages](https://fleetdm.com/guides/deploy-software-packages) (e.g. a bootstrap package), and [Fleet-maintained apps](https://fleetdm.com/guides/fleet-maintained-apps).

Below is the end user experience for Linux. Check out the separate video for [Windows](https://www.youtube.com/watch?v=SHqT29NP-nk).

<div purpose="embedded-content">
<iframe src="https://www.youtube.com/embed/UZAqw4pg9xE?si=rMhbfImonY4Avb06" frameborder="0" allowfullscreen></iframe>
</div>

## End user authentication

Expand Down
10 changes: 5 additions & 5 deletions website/config/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ module.exports.routes = {
'GET /learn-more-about/certificate-authorities': '/guides/connect-end-user-to-wifi-with-certificate',
'GET /learn-more-about/idp-email': 'https://fleetdm.com/docs/rest-api/rest-api#get-human-device-mapping',
'GET /learn-more-about/enrolling-hosts': '/docs/using-fleet/adding-hosts',
'GET /learn-more-about/setup-assistant': '/guides/setup-experience#macos-setup-assistant',
'GET /learn-more-about/setup-assistant': '/guides/setup-experience',
'GET /learn-more-about/policy-automations': '/docs/using-fleet/automations',
'GET /install-wine': 'https://github.com/fleetdm/fleet/blob/main/it-and-security/lib/macos/scripts/install-wine.sh',
'GET /learn-more-about/creating-service-accounts': 'https://console.cloud.google.com/projectselector2/iam-admin/serviceaccounts/create?walkthrough_id=iam--create-service-account&pli=1#step_index=1',
Expand Down Expand Up @@ -1180,10 +1180,10 @@ module.exports.routes = {
'GET /learn-more-about/manual-enrollment-profile': '/docs/rest-api/rest-api#get-manual-enrollment-profile',
'GET /learn-more-about/deleting-android-enterprise': '/guides/android-mdm-setup#deleting-android-enterprise-in-google-admin',
'GET /learn-more-about/google-admin-emm': 'https://admin.google.com/ac/devices/settings/thirdparty',
'GET /learn-more-about/setup-experience/install-software': '/guides/setup-experience#install-software',
'GET /learn-more-about/setup-experience/run-script': '/guides/setup-experience#run-script',
'GET /learn-more-about/setup-experience/end-user-authentication': '/guides/setup-experience#end-user-authentication',
'GET /learn-more-about/setup-experience/bootstrap-package': '/guides/setup-experience#bootstrap-package',
'GET /learn-more-about/setup-experience/install-software': '/guides/setup-experience',
'GET /learn-more-about/setup-experience/run-script': '/guides/setup-experience',
'GET /learn-more-about/setup-experience/end-user-authentication': '/guides/setup-experience',
'GET /learn-more-about/setup-experience/bootstrap-package': '/guides/setup-experience',
'GET /learn-more-about/built-in-variables': '/docs/configuration/yaml-files#variables',
'GET /learn-more-about/disable-entra-conditional-access': '/guides/entra-conditional-access-integration#disable',
'GET /learn-more-about/available-fma-versions': 'https://github.com/fleetdm/fleet/tree/main/ee/maintained-apps/outputs',
Expand Down
Loading