Skip to content

Commit 0ab2d11

Browse files
authored
Merge pull request #2 from FcoCalero/codex/add-missing-sles15-support-49jqwq
Document SLES 15 support and defaults
2 parents 64a5071 + 7c50a6c commit 0ab2d11

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
44

5+
## [Unreleased]
6+
7+
### Added
8+
9+
- Align the SLES 15 SSH defaults and fixtures with the vendor-provided configuration templates.
10+
- Document SLES 10–15 among the supported platforms.
11+
512
## [v5.1.1](https://github.com/ghoneycutt/puppet-module-ssh/tree/v5.1.1) (2024-12-30)
613

714
[Full Changelog](https://github.com/ghoneycutt/puppet-module-ssh/compare/v5.1.0...v5.1.1)

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ known to work on many, many platforms since its creation in 2010.
3636
* EL 7
3737
* EL 8
3838
* EL 9
39+
* SLES 10
40+
* SLES 11
41+
* SLES 12
42+
* SLES 15
3943
* Ubuntu 18.04 LTS
4044
* Ubuntu 20.04 LTS
4145
* Ubuntu 22.04 LTS

data/os/SLES/15.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
# (Suse) SLES 15 defaults in alphabetical order per class
33
ssh::forward_x11_trusted: 'yes'
44
ssh::host: '*'
5+
ssh::include: '/etc/ssh/ssh_config.d/*.conf /usr/etc/ssh/ssh_config.d/*.conf'
56
ssh::packages:
67
- 'openssh'
8+
# SLES 15 groups the locale SendEnv directives across three lines.
79
ssh::send_env:
810
- 'LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES'
911
- 'LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT'
1012
- 'LC_IDENTIFICATION LC_ALL'
1113

14+
# SLES 15 groups the locale AcceptEnv directives across the same three lines.
1215
ssh::server::accept_env:
1316
- 'LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES'
1417
- 'LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT'
1518
- 'LC_IDENTIFICATION LC_ALL'
16-
1719
ssh::server::authorized_keys_file:
1820
- '.ssh/authorized_keys'
19-
2021
ssh::server::client_alive_interval: 180
21-
22-
ssh::server::permit_root_login: 'yes'
22+
ssh::server::include: '/etc/ssh/sshd_config.d/*.conf /usr/etc/ssh/sshd_config.d/*.conf'
2323
ssh::server::print_motd: 'no'
2424
ssh::server::subsystem: 'sftp /usr/lib/ssh/sftp-server'
2525
ssh::server::use_pam: 'yes'

spec/fixtures/testing/SLES-15_ssh_config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
Host *
77
ForwardX11Trusted yes
8+
Include /etc/ssh/ssh_config.d/*.conf /usr/etc/ssh/ssh_config.d/*.conf
89
SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
910
SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
1011
SendEnv LC_IDENTIFICATION LC_ALL

spec/fixtures/testing/SLES-15_sshd_config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44
# See https://man.openbsd.org/sshd_config for more info
55

6+
Include /etc/ssh/sshd_config.d/*.conf /usr/etc/ssh/sshd_config.d/*.conf
67
AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
78
AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
89
AcceptEnv LC_IDENTIFICATION LC_ALL

0 commit comments

Comments
 (0)