From 0f4a7494702d11e0f8e85f2213b4b686c60bd78d Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 4 Aug 2021 15:42:28 +0100 Subject: [PATCH 1/2] (IAC-1709) - Add Support for Debian 11 --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3407180..7b5b1d2 100644 --- a/metadata.json +++ b/metadata.json @@ -53,7 +53,8 @@ "operatingsystemrelease": [ "8", "9", - "10" + "10", + "11" ] }, { From 72c1011315076f7128e5285bda725cff8c28601d Mon Sep 17 00:00:00 2001 From: David Swan Date: Thu, 12 Aug 2021 14:50:29 +0100 Subject: [PATCH 2/2] (IAC-1725) - Changes to account for Debian 11 --- spec/acceptance/pkcs12_spec.rb | 3 ++- spec/spec_helper_acceptance_local.rb | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/acceptance/pkcs12_spec.rb b/spec/acceptance/pkcs12_spec.rb index d4c8bbd..b933a4e 100644 --- a/spec/acceptance/pkcs12_spec.rb +++ b/spec/acceptance/pkcs12_spec.rb @@ -50,7 +50,8 @@ idempotent_apply(pp) - expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && os[:release] == '20.04') + expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && os[:release] == '20.04') || + (os[:family] == 'debian' && os[:release] =~ %r{^11}) [ %r{Alias name: leaf cert}, %r{Entry type: (keyEntry|PrivateKeyEntry)}, diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index cdddf5e..28b74b1 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -195,6 +195,8 @@ class { 'java': } @resource_path = "['C:/Program Files/Java/jdk1.#{java_major}.0_#{java_minor}/bin/']" when 'ubuntu' @ensure_ks = 'present' if os[:release] == '20.04' + when 'debian' + @ensure_ks = 'present' if os[:release].match?(%r{^11}) end end end