Skip to content

Commit

Permalink
Remove ca_cert::force_enable param; Remove ca_cert::enable class
Browse files Browse the repository at this point in the history
The class and param only applied to RHEL 6 and earlier
  • Loading branch information
h-haaks committed May 9, 2024
1 parent 233cb8b commit 28f10e8
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 45 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Optional parameters:
module to manage other installed CA certificates. (defaults to true)
* `ca_certs`: A hash of certificates you would like added. These may also be defined
by declaring `ca_cert::ca` once for each certificate.
* `force_enable`: For RHEL 6 and earlier. When set to true, creates backups of the legacy config, removes it,
and creates symlinks to the new config.

### ca_cert::ca

Expand Down
1 change: 0 additions & 1 deletion manifests/ca.pp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
) {
include ca_cert::params
include ca_cert::update
require ca_cert::enable

if $ca_file_group == undef {
$file_group = $ca_cert::params::ca_file_group
Expand Down
23 changes: 0 additions & 23 deletions manifests/enable.pp

This file was deleted.

3 changes: 0 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
# The package contains the system default (typically Mozilla) CA
# certificates, as well as the tools required for managing other installed
# CA certificates.
# [*force_enable*]
# Use the force-enable option on RH 7 and earlier (and derivatives)
# [*ca_certs*]
# A hash of CA certificates that should be installed as part of the class
# declaration
Expand All @@ -45,7 +43,6 @@
Boolean $always_update_certs = false,
Boolean $purge_unmanaged_CAs = false, # lint:ignore:variable_contains_upcase
Boolean $install_package = true,
Boolean $force_enable = false,
Hash $ca_certs = {},
String $package_ensure = 'installed',
String $package_name = $ca_cert::params::package_name,
Expand Down
1 change: 0 additions & 1 deletion manifests/update.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Private class
class ca_cert::update {
require ca_cert
require ca_cert::enable

exec { 'ca_cert_update':
command => $ca_cert::params::update_cmd,
Expand Down
15 changes: 0 additions & 15 deletions spec/classes/update_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,6 @@
)
}
when 'RedHat'
if facts[:os]['release']['major'] >= '7'
it { is_expected.not_to contain_exec('enable_ca_trust') }
else
context 'with force_enable set to true' do
let :pre_condition do
'class { "ca_cert": force_enable => true }'
end

it { is_expected.to contain_exec('enable_ca_trust').with_command('update-ca-trust force-enable') }
end

context 'with force_enable set to false' do
it { is_expected.to contain_exec('enable_ca_trust').with_command('update-ca-trust enable') }
end
end
it {
is_expected.to contain_exec('ca_cert_update').with(
command: 'update-ca-trust extract',
Expand Down

0 comments on commit 28f10e8

Please sign in to comment.