Skip to content

split puppet-ca-bundle into two components #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bastelfreak merged 1 commit into from
Aug 4, 2026
Merged

split puppet-ca-bundle into two components #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/components/curl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
pkg.mirror "#{settings[:buildsources_url]}/curl-#{pkg.get_version}.tar.gz"

pkg.build_requires "openssl-#{settings[:openssl_version]}"
pkg.build_requires 'puppet-ca-bundle'
pkg.build_requires 'puppet-ca-bundle-8.x'
Comment thread
bastelfreak marked this conversation as resolved.

ldflags = settings[:ldflags]
if platform.is_windows?
Expand Down
0 configs/components/puppet-ca-bundle.json → configs/components/puppet-ca-bundle-8.x.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions configs/components/puppet-ca-bundle.rb → configs/components/puppet-ca-bundle-8.x.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
component 'puppet-ca-bundle' do |pkg, settings, platform|
pkg.load_from_json('configs/components/puppet-ca-bundle.json')
component 'puppet-ca-bundle-8.x' do |pkg, settings, platform|
pkg.load_from_json('configs/components/puppet-ca-bundle-8.x.json')

pkg.build_requires "openssl-#{settings[:openssl_version]}"

Expand Down
4 changes: 4 additions & 0 deletions configs/components/puppet-ca-bundle-main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"url": "https://github.com/openvoxproject/puppet-ca-bundle.git",
"ref": "refs/tags/1.1.0"
}
21 changes: 21 additions & 0 deletions configs/components/puppet-ca-bundle-main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
component 'puppet-ca-bundle-main' do |pkg, settings, platform|
pkg.load_from_json('configs/components/puppet-ca-bundle-main.json')

pkg.build_requires "openssl-#{settings[:openssl_version]}"

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')}"
]

pkg.install do
install_commands
end
end
2 changes: 1 addition & 1 deletion configs/projects/agent-runtime-8.x.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
proj.component "openssl-#{proj.openssl_version}"

proj.component 'curl'
proj.component 'puppet-ca-bundle'
proj.component 'puppet-ca-bundle-8.x'
proj.component "ruby-#{proj.ruby_version}"

proj.component 'rubygem-base64'
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/agent-runtime-main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
proj.component 'libyaml'
proj.component "openssl-#{proj.openssl_version}"

proj.component 'puppet-ca-bundle'
proj.component 'puppet-ca-bundle-main'
proj.component "ruby-#{proj.ruby_version}"

proj.component 'rubygem-concurrent-ruby'
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/openbolt-runtime.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
# Ruby and deps
proj.component "openssl-#{proj.openssl_version}"
proj.component 'runtime-openbolt'
proj.component 'puppet-ca-bundle'
proj.component 'puppet-ca-bundle-8.x'
proj.component "ruby-#{proj.ruby_version}"

proj.component 'rubygem-bcrypt_pbkdf'
Expand Down