mirror of
https://github.com/willshersystems/ansible-sshd
synced 2024-11-21 18:40:19 +01:00
Merge pull request #293 from richm/el10_support
fix: add support for EL10
This commit is contained in:
commit
995a2e0af3
11 changed files with 49 additions and 11 deletions
2
.github/workflows/ansible-lint.yml
vendored
2
.github/workflows/ansible-lint.yml
vendored
|
@ -35,4 +35,4 @@ jobs:
|
||||||
- name: Run ansible-lint
|
- name: Run ansible-lint
|
||||||
uses: ansible/ansible-lint@v24
|
uses: ansible/ansible-lint@v24
|
||||||
with:
|
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
.ostree/packages-runtime-CentOS-10.txt
Symbolic link
1
.ostree/packages-runtime-CentOS-10.txt
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
packages-runtime-RedHat-10.txt
|
|
@ -1,2 +0,0 @@
|
||||||
openssh
|
|
||||||
openssh-server
|
|
1
.ostree/packages-runtime-CentOS-6.txt
Symbolic link
1
.ostree/packages-runtime-CentOS-6.txt
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
packages-runtime-RedHat-6.txt
|
|
@ -1,2 +0,0 @@
|
||||||
openssh
|
|
||||||
openssh-server
|
|
1
.ostree/packages-runtime-CentOS-7.txt
Symbolic link
1
.ostree/packages-runtime-CentOS-7.txt
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
packages-runtime-RedHat-7.txt
|
|
@ -1,2 +0,0 @@
|
||||||
openssh
|
|
||||||
openssh-server
|
|
1
.ostree/packages-runtime-CentOS-8.txt
Symbolic link
1
.ostree/packages-runtime-CentOS-8.txt
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
packages-runtime-RedHat-8.txt
|
|
@ -1,2 +0,0 @@
|
||||||
openssh
|
|
||||||
openssh-server
|
|
1
.ostree/packages-runtime-CentOS-9.txt
Symbolic link
1
.ostree/packages-runtime-CentOS-9.txt
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
packages-runtime-RedHat-9.txt
|
2
.ostree/packages-runtime-RedHat-10.txt
Normal file
2
.ostree/packages-runtime-RedHat-10.txt
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
openssh
|
||||||
|
openssh-server
|
|
@ -1 +0,0 @@
|
||||||
man-db
|
|
1
.ostree/packages-testing-CentOS.txt
Symbolic link
1
.ostree/packages-testing-CentOS.txt
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
packages-testing-RedHat.txt
|
|
@ -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)
|
* [![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
|
* 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)
|
* [![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)
|
* [![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
|
* 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)
|
* [![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)
|
||||||
|
|
|
@ -58,7 +58,13 @@ galaxy_info:
|
||||||
- debian
|
- debian
|
||||||
- centos
|
- centos
|
||||||
- redhat
|
- redhat
|
||||||
|
- fedora
|
||||||
- freebsd
|
- freebsd
|
||||||
- openbsd
|
- openbsd
|
||||||
- aix
|
- aix
|
||||||
|
- el6
|
||||||
|
- el7
|
||||||
|
- el8
|
||||||
|
- el9
|
||||||
|
- el10
|
||||||
dependencies: []
|
dependencies: []
|
||||||
|
|
33
vars/RedHat_10.yml
Normal file
33
vars/RedHat_10.yml
Normal file
|
@ -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…
Reference in a new issue