From 498d050f22b4c9fc2f014a0ef0cb895be988c730 Mon Sep 17 00:00:00 2001
From: Keith Ward <keith.ward@lmax.com>
Date: Sat, 3 Jan 2026 14:25:04 +0000
Subject: [PATCH] Add RHEL 10 Support.

Mostly the same as EL9
Added a note mentioning that UsePAM: no, is not supported any longer it
emits a warning saying it causes problems.

Updated sync.yml to include EL10 as well as debian-12 and ubuntu24.04

So they don't accidentally get nixed
---
 .github/workflows/ci.yaml         |  1 +
 .sync.yml                         |  3 +++
 data/os/RedHat/10.yaml            | 34 +++++++++++++++++++++++++++++++
 metadata.json                     |  9 +++++---
 spec/acceptance/nodesets/el10.yml | 25 +++++++++++++++++++++++
 5 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 data/os/RedHat/10.yaml
 create mode 100644 spec/acceptance/nodesets/el10.yml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8cad4118..c02da7a3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -57,6 +57,7 @@ jobs:
         set:
           - "el8"
           - "el9"
+          - "el10"
           - "debian-11"
           - "debian-12"
           - "ubuntu-2004"
diff --git a/.sync.yml b/.sync.yml
index 866dbac2..fb17f182 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -11,9 +11,12 @@
     set:
       - el8
       - el9
+      - el10
       - debian-11
+      - debian-12
       - ubuntu-2004
       - ubuntu-2204
+      - ubuntu-2404
     puppet:
       - puppet7
       - puppet8
diff --git a/data/os/RedHat/10.yaml b/data/os/RedHat/10.yaml
new file mode 100644
index 00000000..72729a69
--- /dev/null
+++ b/data/os/RedHat/10.yaml
@@ -0,0 +1,34 @@
+---
+ssh::config_files:
+  '50-redhat':
+    lines:
+      Match: 'final all'
+      Include: '/etc/crypto-policies/back-ends/openssh.config'
+      GSSAPIAuthentication: 'yes'
+      ForwardX11Trusted: 'yes'
+ssh::packages:
+  - 'openssh-clients'
+ssh::server::packages:
+  - 'openssh-server'
+
+ssh::include: '/etc/ssh/ssh_config.d/*.conf'
+
+ssh::server::authorized_keys_file:
+  - '.ssh/authorized_keys'
+
+# NOTE: UsePAM: no, is not supported under EL10
+ssh::server::config_files:
+  '40-redhat-crypto-policies':
+    lines:
+      Include: '/etc/crypto-policies/back-ends/opensshserver.config'
+  '50-redhat':
+    lines:
+      SyslogFacility: 'AUTHPRIV'
+      ChallengeResponseAuthentication: 'no'
+      GSSAPIAuthentication: 'yes'
+      GSSAPICleanupCredentials: 'no'
+      UsePAM: 'yes'
+      X11Forwarding: 'yes'
+      PrintMotd: 'no'
+ssh::server::include: '/etc/ssh/sshd_config.d/*.conf'
+ssh::server::subsystem: 'sftp /usr/libexec/openssh/sftp-server'
diff --git a/metadata.json b/metadata.json
index 79623ff3..a7aeb116 100644
--- a/metadata.json
+++ b/metadata.json
@@ -37,7 +37,8 @@
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
@@ -59,14 +60,16 @@
       "operatingsystemrelease": [
         "7",
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
diff --git a/spec/acceptance/nodesets/el10.yml b/spec/acceptance/nodesets/el10.yml
new file mode 100644
index 00000000..111ff184
--- /dev/null
+++ b/spec/acceptance/nodesets/el10.yml
@@ -0,0 +1,25 @@
+HOSTS:
+  el10:
+    roles:
+      - agent
+    platform: el-10-x86_64
+    hypervisor: docker
+    image: almalinux:10
+    docker_preserve_image: true
+    docker_cmd:
+      - '/usr/sbin/init'
+    docker_image_commands:
+      - 'dnf install -y dnf-utils'
+      - 'dnf config-manager --set-enabled crb'
+      - 'dnf install -y wget which cronie iproute initscripts'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'ssh-el10'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]