Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add support for EL10 #293

Merged
merged 3 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ansible-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
- name: Run ansible-lint
uses: ansible/ansible-lint@v24
with:
working_directory: .tox/ansible_collections/${{ env.LSR_ROLE2COLL_NAMESPACE }}/${{ env.LSR_ROLE2COLL_NAME }}
working_directory: ${{ github.workspace }}/.tox/ansible_collections/${{ env.LSR_ROLE2COLL_NAMESPACE }}/${{ env.LSR_ROLE2COLL_NAME }}
1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-10.txt
2 changes: 0 additions & 2 deletions .ostree/packages-runtime-CentOS-6.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-6.txt
2 changes: 0 additions & 2 deletions .ostree/packages-runtime-CentOS-7.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-7.txt
2 changes: 0 additions & 2 deletions .ostree/packages-runtime-CentOS-8.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-8.txt
2 changes: 0 additions & 2 deletions .ostree/packages-runtime-CentOS-9.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-9.txt
2 changes: 2 additions & 0 deletions .ostree/packages-runtime-RedHat-10.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
openssh
openssh-server
1 change: 0 additions & 1 deletion .ostree/packages-testing-CentOS.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Tested on:
* [![Run tests on Ubuntu latest](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-ubuntu.yml/badge.svg)](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-ubuntu.yml)
* Debian wheezy, jessie, stretch, buster, bullseye, bookworm
* [![Run tests on Debian](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-debian-check.yml/badge.svg)](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-debian-check.yml)
* EL 6, 7, 8, 9 derived distributions
* EL 6, 7, 8, 9, 10 derived distributions
* [![Run tests on CentOS](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-centos-check.yml/badge.svg)](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-centos-check.yml)
* All Fedora
* [![Run tests on Fedora latest](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-fedora.yml/badge.svg)](https://github.com/willshersystems/ansible-sshd/actions/workflows/ansible-fedora.yml)
Expand Down
6 changes: 6 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ galaxy_info:
- debian
- centos
- redhat
- fedora
- freebsd
- openbsd
- aix
- el6
- el7
- el8
- el9
- el10
dependencies: []
33 changes: 33 additions & 0 deletions vars/RedHat_10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
__sshd_os_supported: true

__sshd_packages:
- openssh
- openssh-server
__sshd_sftp_server: /usr/libexec/openssh/sftp-server
# RHEL 10 ships with drop-in directory support so we touch
# just included file with highest priority by default
__sshd_config_file: /etc/ssh/sshd_config.d/00-ansible_system_role.conf
# the defaults here represent the defaults shipped in the main sshd_config
__sshd_defaults:
Include: /etc/ssh/sshd_config.d/*.conf
AuthorizedKeysFile: .ssh/authorized_keys
Subsystem: "sftp {{ __sshd_sftp_server }}"

__sshd_verify_hostkeys_default:
- /etc/ssh/ssh_host_rsa_key
- /etc/ssh/ssh_host_ecdsa_key
- /etc/ssh/ssh_host_ed25519_key
__sshd_hostkeys_nofips:
- /etc/ssh/ssh_host_ed25519_key

__sshd_drop_in_dir_mode: '0700'
__sshd_main_config_file: /etc/ssh/sshd_config

__sshd_environment_file: /etc/sysconfig/sshd
__sshd_environment_variable: $OPTIONS
__sshd_service_after: sshd-keygen.target
__sshd_service_wants:
- sshd-keygen.target
- ssh-host-keys-migration.service
__sshd_service_restart_timeout: 42s
Loading