From b3507f86efc53db05afe4074542e6397bfe81eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Charaoui?= Date: Wed, 14 Jan 2026 13:28:17 -0500 Subject: [PATCH 1/2] update ldap client package for Debian 13 and up --- data/os/Debian.yaml | 2 +- data/os/Debian/24.04.yaml | 2 -- spec/classes/openldap_client_install_spec.rb | 6 +----- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 data/os/Debian/24.04.yaml diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml index f8ceac3c..835beb6e 100644 --- a/data/os/Debian.yaml +++ b/data/os/Debian.yaml @@ -1,5 +1,5 @@ --- -openldap::client::package: "libldap-2.4-2" +openldap::client::package: "libldap2" openldap::client::file: "/etc/ldap/ldap.conf" openldap::server::confdir: "/etc/ldap/slapd.d" openldap::server::conffile: "/etc/ldap/slapd.conf" diff --git a/data/os/Debian/24.04.yaml b/data/os/Debian/24.04.yaml deleted file mode 100644 index aa1af657..00000000 --- a/data/os/Debian/24.04.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -openldap::client::package: 'libldap2' diff --git a/spec/classes/openldap_client_install_spec.rb b/spec/classes/openldap_client_install_spec.rb index 1acba64e..ecbc2060 100644 --- a/spec/classes/openldap_client_install_spec.rb +++ b/spec/classes/openldap_client_install_spec.rb @@ -24,13 +24,9 @@ it { is_expected.to contain_package('libldap-2.5-0').with(ensure: :installed) } - when '24.04' - it { - is_expected.to contain_package('libldap2').with(ensure: :installed) - } else it { - is_expected.to contain_package('libldap-2.4-2').with(ensure: :installed) + is_expected.to contain_package('libldap2').with(ensure: :installed) } end when 'RedHat' From c47e4628870da2f5dfcc577f4bd6844c46d80b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Tue, 27 Jan 2026 16:44:38 -1000 Subject: [PATCH 2/2] Add Debian 13 to metadata.json While here, fix CI --- data/os/Debian/11.yaml | 2 ++ data/os/Debian/18.04.yaml | 2 ++ data/os/Debian/20.04.yaml | 2 ++ metadata.json | 3 ++- spec/classes/openldap_client_install_spec.rb | 4 ++++ spec/classes/openldap_client_spec.rb | 10 +++++----- 6 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 data/os/Debian/11.yaml create mode 100644 data/os/Debian/18.04.yaml create mode 100644 data/os/Debian/20.04.yaml diff --git a/data/os/Debian/11.yaml b/data/os/Debian/11.yaml new file mode 100644 index 00000000..914fb51e --- /dev/null +++ b/data/os/Debian/11.yaml @@ -0,0 +1,2 @@ +--- +openldap::client::package: "libldap-2.4-2" diff --git a/data/os/Debian/18.04.yaml b/data/os/Debian/18.04.yaml new file mode 100644 index 00000000..914fb51e --- /dev/null +++ b/data/os/Debian/18.04.yaml @@ -0,0 +1,2 @@ +--- +openldap::client::package: "libldap-2.4-2" diff --git a/data/os/Debian/20.04.yaml b/data/os/Debian/20.04.yaml new file mode 100644 index 00000000..914fb51e --- /dev/null +++ b/data/os/Debian/20.04.yaml @@ -0,0 +1,2 @@ +--- +openldap::client::package: "libldap-2.4-2" diff --git a/metadata.json b/metadata.json index 5d42f7cb..51d2f293 100644 --- a/metadata.json +++ b/metadata.json @@ -39,7 +39,8 @@ "operatingsystemrelease": [ "10", "11", - "12" + "12", + "13" ] }, { diff --git a/spec/classes/openldap_client_install_spec.rb b/spec/classes/openldap_client_install_spec.rb index ecbc2060..396df4af 100644 --- a/spec/classes/openldap_client_install_spec.rb +++ b/spec/classes/openldap_client_install_spec.rb @@ -20,6 +20,10 @@ case facts[:os]['family'] when 'Debian' case facts[:os]['release']['major'] + when '11', '18.04', '20.04' + it { + is_expected.to contain_package('libldap-2.4-2').with(ensure: :installed) + } when '12', '22.04' it { is_expected.to contain_package('libldap-2.5-0').with(ensure: :installed) diff --git a/spec/classes/openldap_client_spec.rb b/spec/classes/openldap_client_spec.rb index 4b9df3fc..095cf7d2 100644 --- a/spec/classes/openldap_client_spec.rb +++ b/spec/classes/openldap_client_spec.rb @@ -16,17 +16,17 @@ case facts[:os]['family'] when 'Debian' case facts[:os]['release']['major'] - when '12', '22.04' + when '11', '18.04', '20.04' it { - is_expected.to contain_class('openldap::client').with(package: 'libldap-2.5-0', + is_expected.to contain_class('openldap::client').with(package: 'libldap-2.4-2', file: '/etc/ldap/ldap.conf', base: nil, uri: nil, tls_cacert: nil) } - when '24.04' + when '12', '22.04' it { - is_expected.to contain_class('openldap::client').with(package: 'libldap2', + is_expected.to contain_class('openldap::client').with(package: 'libldap-2.5-0', file: '/etc/ldap/ldap.conf', base: nil, uri: nil, @@ -34,7 +34,7 @@ } else it { - is_expected.to contain_class('openldap::client').with(package: 'libldap-2.4-2', + is_expected.to contain_class('openldap::client').with(package: 'libldap2', file: '/etc/ldap/ldap.conf', base: nil, uri: nil,