From dadf9b82741d36fe85fe25ebc3d03e72ec6ef0ff Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 4 Aug 2026 21:11:00 +0200 Subject: [PATCH 1/2] puppet-ca-bundle-main: Update 1.1.0->1.2.0 Signed-off-by: Tim Meusel --- configs/components/puppet-ca-bundle-main.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet-ca-bundle-main.json b/configs/components/puppet-ca-bundle-main.json index 7a325ce4..893304e8 100644 --- a/configs/components/puppet-ca-bundle-main.json +++ b/configs/components/puppet-ca-bundle-main.json @@ -1,4 +1,4 @@ { "url": "https://github.com/openvoxproject/puppet-ca-bundle.git", - "ref": "refs/tags/1.1.0" + "ref": "refs/tags/1.2.0" } From 066fd48df6232ed9aeda1582eac53153752d6beb Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 4 Aug 2026 21:28:14 +0200 Subject: [PATCH 2/2] puppet-ca-bundle-main: dont install keystore latest version of our CA bundle only has the actual pem files, no keystore. We suspect that the keystore isn't used. We don't build java, we use system-provided JREs. They have their own keystore. It's likely that this is a PE leftover (PE packages java). Signed-off-by: Tim Meusel --- configs/components/puppet-ca-bundle-main.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configs/components/puppet-ca-bundle-main.rb b/configs/components/puppet-ca-bundle-main.rb index 90eb9a5f..b3d75cea 100644 --- a/configs/components/puppet-ca-bundle-main.rb +++ b/configs/components/puppet-ca-bundle-main.rb @@ -5,14 +5,8 @@ openssl_cmd = "#{settings[:bindir]}/openssl" - target = if platform.is_fips? - 'install-fips' - else - 'install' - end - install_commands = [ - "#{platform[:make]} #{target} OPENSSL=#{openssl_cmd} USER=0 GROUP=0 DESTDIR=#{File.join(settings[:prefix], 'ssl')}" + "#{platform[:make]} install-bundle OPENSSL=#{openssl_cmd} USER=0 GROUP=0 DESTDIR=#{File.join(settings[:prefix], 'ssl')}" ] pkg.install do