From 4d7e406095dd8d74d2a0f7a09378846ae523c14f Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
Date: Fri, 15 Mar 2024 13:03:32 -0400
Subject: [PATCH 1/2] Update to use the latest Tanium Client installers

---
 vars/Debian.yml | 2 +-
 vars/RedHat.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vars/Debian.yml b/vars/Debian.yml
index 8ad8dde..9783e08 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,3 +1,3 @@
 ---
 # The name of the S3 object corresponding to the Tanium system package
-package_object_name: taniumclient_7.4.10.1060-{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}_amd64.deb
+package_object_name: taniumclient_7.4.10.1075-{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}_amd64.deb
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 5ce72ae..bd920b8 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,3 +1,3 @@
 ---
 # The name of the S3 object corresponding to the Tanium system package
-package_object_name: TaniumClient-7.4.10.1060-1.rhe9.x86_64.rpm
+package_object_name: TaniumClient-7.4.10.1075-1.rhe9.x86_64.rpm

From 40d5ccfc3225c9d436439f5eefe18d21c6444fbf Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
Date: Fri, 15 Mar 2024 13:18:39 -0400
Subject: [PATCH 2/2] Add support for Amazon Linux 2023

We now have an installer for AL 2023, so we may as well support it.
---
 meta/main.yml                              |  9 +++--
 molecule/default/molecule-with-systemd.yml | 39 +++++++++++-----------
 vars/Amazon.yml                            |  3 ++
 3 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 vars/Amazon.yml

diff --git a/meta/main.yml b/meta/main.yml
index 9a5d7d8..97624e4 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -24,10 +24,9 @@ galaxy_info:
   min_ansible_version: "2.10"
   namespace: cisagov
   platforms:
-    # We do not have a package for Amazon Linux 2023.
-    # - name: Amazon Linux
-    #   versions:
-    #     - "2023"
+    - name: Amazon Linux
+      versions:
+        - "2023"
     - name: Debian
       versions:
         - buster
@@ -38,7 +37,7 @@ galaxy_info:
       versions:
         - "37"
         - "38"
-    # Kali is based on Debian Bookworm, which is not yet supported by
+    # Kali is based on Debian Testing, which is not supported by
     # Tanium.
     # - name: Kali
     #   versions:
diff --git a/molecule/default/molecule-with-systemd.yml b/molecule/default/molecule-with-systemd.yml
index 00da307..4e16af2 100644
--- a/molecule/default/molecule-with-systemd.yml
+++ b/molecule/default/molecule-with-systemd.yml
@@ -10,16 +10,15 @@ dependency:
 driver:
   name: docker
 platforms:
-  # We do not have a package for Amazon Linux 2023.
-  # - cgroupns_mode: host
-  #   command: /lib/systemd/systemd
-  #   image: geerlingguy/docker-amazonlinux2023-ansible:latest
-  #   name: amazonlinux2023-systemd
-  #   platform: amd64
-  #   pre_build_image: true
-  #   privileged: true
-  #   volumes:
-  #     - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: geerlingguy/docker-amazonlinux2023-ansible:latest
+    name: amazonlinux2023-systemd
+    platform: amd64
+    pre_build_image: true
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
     image: geerlingguy/docker-debian10-ansible:latest
@@ -38,16 +37,16 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  # Debian Bookworm is not yet supported by Tanium
-  # - cgroupns_mode: host
-  #   command: /lib/systemd/systemd
-  #   image: cisagov/docker-debian12-ansible:latest
-  #   name: debian12-systemd
-  #   platform: amd64
-  #   pre_build_image: true
-  #   privileged: true
-  #   volumes:
-  #     - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: cisagov/docker-debian12-ansible:latest
+    name: debian12-systemd
+    platform: amd64
+    pre_build_image: true
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  # Kali is based on Debian Testing, which is not supported by Tanium.
   # - cgroupns_mode: host
   #   command: /lib/systemd/systemd
   #   image: cisagov/docker-kali-ansible:latest
diff --git a/vars/Amazon.yml b/vars/Amazon.yml
new file mode 100644
index 0000000..2304867
--- /dev/null
+++ b/vars/Amazon.yml
@@ -0,0 +1,3 @@
+---
+# The name of the S3 object corresponding to the Tanium system package
+package_object_name: TaniumClient-7.4.10.1075-1.amzn2023.0.20230503.x86_64.rpm