diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8cad4118..fd658571 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,6 +59,7 @@ jobs: - "el9" - "debian-11" - "debian-12" + - "debian-13" - "ubuntu-2004" - "ubuntu-2204" - "ubuntu-2404" diff --git a/README.md b/README.md index a11314cb..911e9397 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ known to work on many, many platforms since its creation in 2010. * Debian 10 * Debian 11 * Debian 12 + * Debian 13 * EL 7 * EL 8 * EL 9 diff --git a/data/os/Debian/13.yaml b/data/os/Debian/13.yaml new file mode 100644 index 00000000..d3945c9b --- /dev/null +++ b/data/os/Debian/13.yaml @@ -0,0 +1,24 @@ +--- +# Debian 13 defaults in alphabetical order per class +ssh::gss_api_authentication: 'yes' +ssh::hash_known_hosts: 'yes' +ssh::host: '*' +ssh::include: '/etc/ssh/ssh_config.d/*.conf' +ssh::packages: + - 'openssh-client' +ssh::send_env: + - 'LANG' + - 'LC_*' + +ssh::server::accept_env: + - 'LANG' + - 'LC_*' +ssh::server::kbd_interactive_authentication: 'no' +ssh::server::include: '/etc/ssh/sshd_config.d/*.conf' +ssh::server::packages: + - 'openssh-server' +ssh::server::print_motd: 'no' +ssh::server::service_name: 'ssh' +ssh::server::subsystem: 'sftp /usr/lib/openssh/sftp-server' +ssh::server::use_pam: 'yes' +ssh::server::x11_forwarding: 'yes' diff --git a/metadata.json b/metadata.json index 79623ff3..d852b7a3 100644 --- a/metadata.json +++ b/metadata.json @@ -44,7 +44,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "11", - "12" + "12", + "13" ] }, { diff --git a/spec/acceptance/nodesets/debian-13.yml b/spec/acceptance/nodesets/debian-13.yml new file mode 100644 index 00000000..a8a98ca2 --- /dev/null +++ b/spec/acceptance/nodesets/debian-13.yml @@ -0,0 +1,27 @@ +HOSTS: + debian13: + roles: + - agent + platform: debian-13-amd64 + hypervisor: docker + image: debian:13 + docker_preserve_image: true + docker_cmd: + - '/sbin/init' + docker_image_commands: + - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates' + - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment' + - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen' + - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' + - 'locale-gen en_US.UTF-8' + docker_env: + - LANG=en_US.UTF-8 + - LANGUAGE=en_US.UTF-8 + - LC_ALL=en_US.UTF-8 + docker_container_name: 'ssh-debian13' +CONFIG: + log_level: debug + type: foss +ssh: + password: root + auth_methods: ["password"] diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 5092d861..59812f12 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -22,7 +22,7 @@ when %r{Debian-10}, %r{Ubuntu-18.04} packages_client = ['openssh-client'] packages_server = ['openssh-server'] - when %r{Debian-1[12]}, %r{Ubuntu-(20.04|22.04|24.04)} + when %r{Debian-1[123]}, %r{Ubuntu-(20.04|22.04|24.04)} packages_client = ['openssh-client'] packages_server = ['openssh-server'] include_dir = '/etc/ssh/ssh_config.d' diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb index 352f9ca8..eabe2b3a 100644 --- a/spec/classes/server_spec.rb +++ b/spec/classes/server_spec.rb @@ -39,7 +39,7 @@ packages = ['openssh-server'] service_hasstatus = true service_name = 'ssh' - when %r{Debian-1[12]}, %r{Ubuntu-(20.04|22.04|24.04)} + when %r{Debian-1[123]}, %r{Ubuntu-(20.04|22.04|24.04)} config_mode = '0600' packages = ['openssh-server'] service_hasstatus = true diff --git a/spec/fixtures/testing/Debian-13_ssh_config b/spec/fixtures/testing/Debian-13_ssh_config new file mode 100644 index 00000000..6771373a --- /dev/null +++ b/spec/fixtures/testing/Debian-13_ssh_config @@ -0,0 +1,13 @@ +# This file is being maintained by Puppet. +# DO NOT EDIT +# +# See https://man.openbsd.org/ssh_config for more info + +Host * + GSSAPIAuthentication yes + HashKnownHosts yes + Include /etc/ssh/ssh_config.d/*.conf + SendEnv LANG + SendEnv LC_* + SendEnv COLORTERM + SendEnv NO_COLOR diff --git a/spec/fixtures/testing/Debian-13_sshd_config b/spec/fixtures/testing/Debian-13_sshd_config new file mode 100644 index 00000000..387b2ea1 --- /dev/null +++ b/spec/fixtures/testing/Debian-13_sshd_config @@ -0,0 +1,15 @@ +# This file is being maintained by Puppet. +# DO NOT EDIT +# +# See https://man.openbsd.org/sshd_config for more info + +Include /etc/ssh/sshd_config.d/*.conf +AcceptEnv LANG +AcceptEnv LC_* +AcceptEnv COLORTERM +AcceptEnv NO_COLOR +KbdInteractiveAuthentication no +PrintMotd no +Subsystem sftp /usr/lib/openssh/sftp-server +UsePAM yes +X11Forwarding yes