Skip to content

Commit 45aabc0

Browse files
committed
Add tests for Debian 12 and Ubuntu 24.04
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
1 parent 5dbddec commit 45aabc0

File tree

10 files changed

+106
-2
lines changed

10 files changed

+106
-2
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ jobs:
5858
- "el8"
5959
- "el9"
6060
- "debian-11"
61+
- "debian-12"
6162
- "ubuntu-2004"
6263
- "ubuntu-2204"
64+
- "ubuntu-2404"
6365
puppet:
6466
- "puppet7"
6567
- "puppet8"

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ known to work on many, many platforms since its creation in 2010.
3232
* Archlinux
3333
* Debian 10
3434
* Debian 11
35+
* Debian 12
3536
* EL 7
3637
* EL 8
3738
* EL 9
3839
* Ubuntu 18.04 LTS
3940
* Ubuntu 20.04 LTS
4041
* Ubuntu 22.04 LTS
42+
* Ubuntu 24.04 LTS
4143
* Solaris 10
4244
* Solaris 11
4345

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
HOSTS:
2+
debian12:
3+
roles:
4+
- agent
5+
platform: debian-12-amd64
6+
hypervisor: docker
7+
image: debian:12
8+
docker_preserve_image: true
9+
docker_cmd:
10+
- '/sbin/init'
11+
docker_image_commands:
12+
- 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates'
13+
- 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
14+
- 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
15+
- 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
16+
- 'locale-gen en_US.UTF-8'
17+
docker_env:
18+
- LANG=en_US.UTF-8
19+
- LANGUAGE=en_US.UTF-8
20+
- LC_ALL=en_US.UTF-8
21+
docker_container_name: 'ssh-debian12'
22+
CONFIG:
23+
log_level: debug
24+
type: foss
25+
ssh:
26+
password: root
27+
auth_methods: ["password"]
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu2404:
3+
roles:
4+
- agent
5+
platform: ubuntu-24.04-amd64
6+
hypervisor : docker
7+
image: ubuntu:24.04
8+
docker_preserve_image: true
9+
docker_cmd: '["/sbin/init"]'
10+
docker_image_commands:
11+
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
12+
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
13+
- 'locale-gen en_US.UTF-8'
14+
docker_env:
15+
- LANG=en_US.UTF-8
16+
- LANGUAGE=en_US.UTF-8
17+
- LC_ALL=en_US.UTF-8
18+
docker_container_name: 'ssh-ubuntu2404'
19+
CONFIG:
20+
log_level: debug
21+
type: foss
22+
ssh:
23+
password: root
24+
auth_methods: ["password"]

spec/classes/init_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
when %r{Debian-10}, %r{Ubuntu-18.04}
2323
packages_client = ['openssh-client']
2424
packages_server = ['openssh-server']
25-
when %r{Debian-11}, %r{Ubuntu-(20.04|22.04)}
25+
when %r{Debian-1[12]}, %r{Ubuntu-(20.04|22.04|24.04)}
2626
packages_client = ['openssh-client']
2727
packages_server = ['openssh-server']
2828
include_dir = '/etc/ssh/ssh_config.d'

spec/classes/server_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
packages = ['openssh-server']
4040
service_hasstatus = true
4141
service_name = 'ssh'
42-
when %r{Debian-11}, %r{Ubuntu-(20.04|22.04)}
42+
when %r{Debian-1[12]}, %r{Ubuntu-(20.04|22.04|24.04)}
4343
config_mode = '0600'
4444
packages = ['openssh-server']
4545
service_hasstatus = true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This file is being maintained by Puppet.
2+
# DO NOT EDIT
3+
#
4+
# See https://man.openbsd.org/ssh_config for more info
5+
6+
Host *
7+
GSSAPIAuthentication yes
8+
HashKnownHosts yes
9+
Include /etc/ssh/ssh_config.d/*.conf
10+
SendEnv LANG
11+
SendEnv LC_*
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This file is being maintained by Puppet.
2+
# DO NOT EDIT
3+
#
4+
# See https://man.openbsd.org/sshd_config for more info
5+
6+
Include /etc/ssh/sshd_config.d/*.conf
7+
AcceptEnv LANG
8+
AcceptEnv LC_*
9+
KbdInteractiveAuthentication no
10+
PrintMotd no
11+
Subsystem sftp /usr/lib/openssh/sftp-server
12+
UsePAM yes
13+
X11Forwarding yes
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This file is being maintained by Puppet.
2+
# DO NOT EDIT
3+
#
4+
# See https://man.openbsd.org/ssh_config for more info
5+
6+
Host *
7+
GSSAPIAuthentication yes
8+
HashKnownHosts yes
9+
Include /etc/ssh/ssh_config.d/*.conf
10+
SendEnv LANG
11+
SendEnv LC_*
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file is being maintained by Puppet.
2+
# DO NOT EDIT
3+
#
4+
# See https://man.openbsd.org/sshd_config for more info
5+
6+
Include /etc/ssh/sshd_config.d/*.conf
7+
AcceptEnv LANG
8+
AcceptEnv LC_*
9+
KbdInteractiveAuthentication no
10+
PasswordAuthentication yes
11+
PrintMotd no
12+
Subsystem sftp /usr/lib/openssh/sftp-server
13+
UsePAM yes
14+
X11Forwarding yes

0 commit comments

Comments
 (0)