From 00480f8fb043635e17082d54b2213d4487d5bc4f Mon Sep 17 00:00:00 2001 From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com> Date: Tue, 8 Apr 2025 17:45:14 -0500 Subject: [PATCH] Renaming teams to support Android devices (#27991) Related to fleetdm/confidential#9192 --- .github/workflows/dogfood-gitops.yml | 2 ++ it-and-security/default.yml | 9 +++--- it-and-security/teams/company-owned-ipads.yml | 28 ------------------- ...s.yml => company-owned-mobile-devices.yml} | 7 +++-- ...phones.yml => personal-mobile-devices.yml} | 7 +++-- 5 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 it-and-security/teams/company-owned-ipads.yml rename it-and-security/teams/{company-owned-iphones.yml => company-owned-mobile-devices.yml} (79%) rename it-and-security/teams/{personally-owned-iphones.yml => personal-mobile-devices.yml} (77%) diff --git a/.github/workflows/dogfood-gitops.yml b/.github/workflows/dogfood-gitops.yml index 76d34323e1..cf2440f9d7 100644 --- a/.github/workflows/dogfood-gitops.yml +++ b/.github/workflows/dogfood-gitops.yml @@ -74,6 +74,8 @@ jobs: DOGFOOD_COMPLIANCE_EXCLUSIONS_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPLIANCE_EXCLUSIONS_ENROLL_SECRET }} DOGFOOD_COMPANY_OWNED_IPHONES_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPANY_OWNED_IPHONES_ENROLL_SECRET }} DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET }} + DOGFOOD_COMPANY_OWNED_MOBILE_DEVICES_ENROLL_SECRET: ${{ secrets.DOGFOOD_COMPANY_OWNED_MOBILE_DEVICES_ENROLL_SECRET }} + DOGFOOD_PERSONAL_MOBILE_DEVICES_ENROLL_SECRET: ${{ secrets.DOGFOOD_PERSONAL_MOBILE_DEVICES_ENROLL_SECRET }} FLEET_SECRET_MANAGED_CHROME_ENROLLMENT_TOKEN: ${{ secrets.CLOUD_MANAGEMENT_ENROLLMENT_TOKEN }} DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET: ${{ secrets.DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET }} DOGFOOD_ACTIVITIES_WEBHOOK_URL: ${{ secrets.DOGFOOD_ACTIVITIES_WEBHOOK_URL }} diff --git a/it-and-security/default.yml b/it-and-security/default.yml index 791d284061..ab679485d6 100644 --- a/it-and-security/default.yml +++ b/it-and-security/default.yml @@ -25,16 +25,15 @@ org_settings: apple_business_manager: - organization_name: Fleet Device Management Inc. macos_team: "💻 Workstations" - ios_team: "📱🏢 Company-owned iPhones" - ipados_team: "🔳🏢 Company-owned iPads" + ios_team: "📱🏢 Company-owned Mobile Devices" + ipados_team: "📱🏢 Company-owned Mobile Devices" volume_purchasing_program: - location: Fleet Device Management Inc. teams: - "💻 Workstations" - "💻🐣 Workstations (canary)" - - "📱🏢 Company-owned iPhones" - - "🔳🏢 Company-owned iPads" - - "📱🔐 Personally-owned iPhones" + - "📱🏢 Company-owned Mobile Devices" + - "📱🔐 Personal Mobile Devices" org_info: contact_url: https://fleetdm.com/company/contact org_logo_url: "" diff --git a/it-and-security/teams/company-owned-ipads.yml b/it-and-security/teams/company-owned-ipads.yml deleted file mode 100644 index c3c04539f4..0000000000 --- a/it-and-security/teams/company-owned-ipads.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: 🔳🏢 Company-owned iPads -team_settings: - features: - host_expiry_settings: - host_expiry_enabled: false - host_expiry_window: 0 - secrets: - - secret: $DOGFOOD_COMPANY_OWNED_IPADS_ENROLL_SECRET - integrations: - google_calendar: - enable_calendar_events: false -agent_options: -controls: - ipados_updates: - deadline: "2025-04-26" - minimum_version: "18.4" - macos_settings: - custom_settings: - - path: ../lib/ipados/declaration-profiles/software-update-settings.json - - path: ../lib/ipados/declaration-profiles/passcode-settings.json - - path: ../lib/ipados/configuration-profiles/lock-screen-message.mobileconfig - scripts: -policies: -queries: -software: - app_store_apps: - - app_store_id: '618783545' # Slack - - app_store_id: '546505307' # Zoom diff --git a/it-and-security/teams/company-owned-iphones.yml b/it-and-security/teams/company-owned-mobile-devices.yml similarity index 79% rename from it-and-security/teams/company-owned-iphones.yml rename to it-and-security/teams/company-owned-mobile-devices.yml index 4847c79b85..8331c96634 100644 --- a/it-and-security/teams/company-owned-iphones.yml +++ b/it-and-security/teams/company-owned-mobile-devices.yml @@ -1,11 +1,11 @@ -name: 📱🏢 Company-owned iPhones +name: 📱🏢 Company-owned Mobile Devices team_settings: features: host_expiry_settings: host_expiry_enabled: false host_expiry_window: 0 secrets: - - secret: $DOGFOOD_COMPANY_OWNED_IPHONES_ENROLL_SECRET + - secret: $DOGFOOD_COMPANY_OWNED_MOBILE_DEVICES_ENROLL_SECRET integrations: google_calendar: enable_calendar_events: false @@ -14,6 +14,9 @@ controls: ios_updates: deadline: "2025-04-26" minimum_version: "18.4" + ipados_updates: + deadline: "2025-04-26" + minimum_version: "18.4" macos_settings: custom_settings: - path: ../lib/ios/configuration-profiles/lock-screen-message.mobileconfig diff --git a/it-and-security/teams/personally-owned-iphones.yml b/it-and-security/teams/personal-mobile-devices.yml similarity index 77% rename from it-and-security/teams/personally-owned-iphones.yml rename to it-and-security/teams/personal-mobile-devices.yml index 0db1438393..42f16dd917 100644 --- a/it-and-security/teams/personally-owned-iphones.yml +++ b/it-and-security/teams/personal-mobile-devices.yml @@ -1,11 +1,11 @@ -name: 📱🔐 Personally-owned iPhones +name: 📱🔐 Personal Mobile Devices team_settings: features: host_expiry_settings: host_expiry_enabled: false host_expiry_window: 0 secrets: - - secret: $DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET + - secret: $DOGFOOD_PERSONAL_MOBILE_DEVICES_ENROLL_SECRET integrations: google_calendar: enable_calendar_events: false @@ -14,6 +14,9 @@ controls: ios_updates: deadline: "2025-04-26" minimum_version: "18.4" + ipados_updates: + deadline: "2025-04-26" + minimum_version: "18.4" macos_settings: custom_settings: - path: ../lib/ios/declaration-profiles/passcode-settings.json