From ce792e17147ae038b2834941b700e8b9be19dfd8 Mon Sep 17 00:00:00 2001 From: Allen Houchins Date: Thu, 3 Apr 2025 14:55:20 -0500 Subject: [PATCH 1/3] Updated script and policy to match naming convention --- ...op.yml => check-fleet-desktop-extension-fedora-debian.yml} | 4 ++-- ...-desktop.sh => enable-fleet-desktop-required-extension.sh} | 0 it-and-security/teams/workstations-canary.yml | 2 +- 3 files changed, 3 insertions(+), 3 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 => enable-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 1968c1e29bd..5211d741027 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/enable-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/enable-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/enable-fleet-desktop-required-extension.sh diff --git a/it-and-security/teams/workstations-canary.yml b/it-and-security/teams/workstations-canary.yml index 59a133bcd6d..ff75fabe6e4 100644 --- a/it-and-security/teams/workstations-canary.yml +++ b/it-and-security/teams/workstations-canary.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: From faf7ce9bbf0675629652e1f63867a240cbbe5aea Mon Sep 17 00:00:00 2001 From: Allen Houchins Date: Thu, 3 Apr 2025 14:58:43 -0500 Subject: [PATCH 2/3] multiple updates --- .../policies/check-fleet-desktop-extension-fedora-debian.yml | 2 +- ...extension.sh => install-fleet-desktop-required-extension.sh} | 0 it-and-security/teams/workstations-canary.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename it-and-security/lib/linux/scripts/{enable-fleet-desktop-required-extension.sh => install-fleet-desktop-required-extension.sh} (100%) diff --git a/it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml b/it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml index 5211d741027..c81d3fa6d9e 100644 --- a/it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml +++ b/it-and-security/lib/linux/policies/check-fleet-desktop-extension-fedora-debian.yml @@ -29,4 +29,4 @@ ) ); run_script: - path: ../scripts/enable-fleet-desktop-required-extension.sh + path: ../scripts/install-fleet-desktop-required-extension.sh diff --git a/it-and-security/lib/linux/scripts/enable-fleet-desktop-required-extension.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/enable-fleet-desktop-required-extension.sh rename to it-and-security/lib/linux/scripts/install-fleet-desktop-required-extension.sh diff --git a/it-and-security/teams/workstations-canary.yml b/it-and-security/teams/workstations-canary.yml index ff75fabe6e4..f65bf30e371 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 From 9167f6f9eb127b394cd5817a3f8a0d07589290ef Mon Sep 17 00:00:00 2001 From: Allen Houchins Date: Thu, 3 Apr 2025 15:02:11 -0500 Subject: [PATCH 3/3] multiple updates --- it-and-security/teams/compliance-exclusions.yml | 4 ++-- it-and-security/teams/servers-canary.yml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/it-and-security/teams/compliance-exclusions.yml b/it-and-security/teams/compliance-exclusions.yml index 4f466977ddb..661928f9f09 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 96d88360c3e..7cf811d5e1d 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: