From b0a6bd41eb7c09d12e2ad4c19ccaede9f13f3280 Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Sat, 5 Apr 2025 22:11:01 -0500
Subject: [PATCH] Updated script and policy to match naming convention (#27858)

- updated the script and policy names to reflect naming convention and
look better in Fleet Desktop
- removed script from Servers (canary); since Fleet Desktop is not
enabled on Servers, it leads to awkward conversations when demo'ing with
customers.
---
 ...op.yml => check-fleet-desktop-extension-fedora-debian.yml} | 4 ++--
 ...desktop.sh => install-fleet-desktop-required-extension.sh} | 0
 it-and-security/teams/compliance-exclusions.yml               | 4 ++--
 it-and-security/teams/servers-canary.yml                      | 2 --
 it-and-security/teams/workstations-canary.yml                 | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename it-and-security/lib/linux/policies/{fedora-debian-check-fleet-desktop.yml => check-fleet-desktop-extension-fedora-debian.yml} (94%)
 rename it-and-security/lib/linux/scripts/{fedora-debian-enable-fleet-desktop.sh => install-fleet-desktop-required-extension.sh} (100%)

diff --git a/it-and-security/lib/linux/policies/fedora-debian-check-fleet-desktop.yml b/it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml
similarity index 94%
rename from it-and-security/lib/linux/policies/fedora-debian-check-fleet-desktop.yml
rename to it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml
index 1968c1e29b..c81d3fa6d9 100644
--- a/it-and-security/lib/linux/policies/fedora-debian-check-fleet-desktop.yml
+++ b/it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml
@@ -1,4 +1,4 @@
-- name: Check Fleet Desktop on Fedora and Debian
+- name: Linux - Fleet Desktop extensions enabled
   critical: false
   description: This policy checks if the extension required for Fleet Desktop is installed and enabled.
   resolution: |
@@ -29,4 +29,4 @@
       )
     );
   run_script:
-    path: ../scripts/fedora-debian-enable-fleet-desktop.sh
+    path: ../scripts/install-fleet-desktop-required-extension.sh
diff --git a/it-and-security/lib/linux/scripts/fedora-debian-enable-fleet-desktop.sh b/it-and-security/lib/linux/scripts/install-fleet-desktop-required-extension.sh
similarity index 100%
rename from it-and-security/lib/linux/scripts/fedora-debian-enable-fleet-desktop.sh
rename to it-and-security/lib/linux/scripts/install-fleet-desktop-required-extension.sh
diff --git a/it-and-security/teams/compliance-exclusions.yml b/it-and-security/teams/compliance-exclusions.yml
index 4f466977dd..661928f9f0 100644
--- a/it-and-security/teams/compliance-exclusions.yml
+++ b/it-and-security/teams/compliance-exclusions.yml
@@ -33,10 +33,10 @@ controls:
     - path: ../lib/macos/scripts/uninstall-fleetd-macos.sh
     - path: ../lib/windows/scripts/uninstall-fleetd-windows.ps1
     - path: ../lib/linux/scripts/uninstall-fleetd-linux.sh
-    - path: ../lib/linux/scripts/fedora-debian-enable-fleet-desktop.sh
+    - path: ../lib/linux/scripts/install-fleet-desktop-required-extension.sh
 policies:
   - path: ../lib/macos/policies/enrollment-profile-up-to-date.yml
-  - path: ../lib/linux/policies/fedora-debian-check-fleet-desktop.yml
+  - path: ../lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml
 queries:
 software:
   packages:
diff --git a/it-and-security/teams/servers-canary.yml b/it-and-security/teams/servers-canary.yml
index 96d88360c3..7cf811d5e1 100644
--- a/it-and-security/teams/servers-canary.yml
+++ b/it-and-security/teams/servers-canary.yml
@@ -27,8 +27,6 @@ controls:
     deadline_days: null
     grace_period_days: null
   scripts:
-    - path: ../lib/linux/scripts/fedora-debian-enable-fleet-desktop.sh
 policies:
-  - path: ../lib/linux/policies/fedora-debian-check-fleet-desktop.yml
 queries:
 software:
diff --git a/it-and-security/teams/workstations-canary.yml b/it-and-security/teams/workstations-canary.yml
index 59a133bcd6..f65bf30e37 100644
--- a/it-and-security/teams/workstations-canary.yml
+++ b/it-and-security/teams/workstations-canary.yml
@@ -140,7 +140,7 @@ controls:
     - path: ../lib/windows/scripts/create-admin-user.ps1
     - path: ../lib/windows/scripts/uninstall-fleetd-windows.ps1
     - path: ../lib/linux/scripts/uninstall-fleetd-linux.sh
-    - path: ../lib/linux/scripts/fedora-debian-enable-fleet-desktop.sh
+    - path: ../lib/linux/scripts/install-fleet-desktop-required-extension.sh
 policies:
   - path: ../lib/macos/policies/1password-emergency-kit-check.yml
   - path: ../lib/macos/policies/update-firefox.yml
@@ -157,7 +157,7 @@ policies:
   - path: ../lib/windows/policies/1password-installed.yml
   - path: ../lib/windows/policies/update-1password.yml
   - path: ../lib/linux/policies/disk-encryption-check.yml
-  - path: ../lib/linux/policies/fedora-debian-check-fleet-desktop.yml
+  - path: ../lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml
 queries:
   - path: ../lib/macos/queries/detect-apple-intelligence.yml
 software: