Skip to content

Commit

Permalink
Merge pull request #207 from puppetlabs/maint/fix_duplicate_solaris_cert
Browse files Browse the repository at this point in the history
(maint) Fix duplicate solaris ca cert
  • Loading branch information
yachub committed Nov 1, 2022
2 parents b1a3fe8 + 51429d9 commit f3222d9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
7 changes: 2 additions & 5 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
#This Repository is maintained by both the release engineering, and installer teams, depending on the location of the changes
* @puppetlabs/release-engineering
/lib/beaker-pe/install @puppetlabs/installer-and-management
/lib/beaker-pe/pe-client-tools @puppetlabs/installer-and-management
/spec/beaker-pe/install @puppetlabs/installer-and-management
#This Repository is maintained by the release engineering, skeletor, and nimbus teams
* @puppetlabs/release-engineering @puppetlabs/skeletor @puppetlabs/nimbus
8 changes: 4 additions & 4 deletions lib/beaker-pe/install/pe_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1396,10 +1396,10 @@ def solaris_key_chain_fix
EOM
hosts.each do |host|
if host.platform=~ /solaris-11(\.2)?-(i386|sparc)/
create_remote_file(host, "DigiCertTrustedRootG4.crt.pem", digicert)
on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
create_remote_file(host, "DigiCert_Trusted_Root_G4.pem", digicert)
on(host, 'chmod a+r /root/DigiCert_Trusted_Root_G4.pem')
on(host, 'cp -p /root/DigiCert_Trusted_Root_G4.pem /etc/certs/CA/')
on(host, 'rm /root/DigiCert_Trusted_Root_G4.pem')
on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
timeout = 60
counter = 0
Expand Down

0 comments on commit f3222d9

Please sign in to comment.