EL9 distrust-dir changed from backlist to blocklist

voxpupuli · Jun 5, 2024 · 124031e · 124031e
1 parent 225f641
commit 124031e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/data/RedHat-family-9.yaml b/data/RedHat-family-9.yaml
@@ -0,0 +1,2 @@
+---
+ca_cert::distrusted_cert_dir: '/etc/pki/ca-trust/source/blocklist'
diff --git a/spec/acceptance/ca_cert_ca_spec.rb b/spec/acceptance/ca_cert_ca_spec.rb
@@ -9,7 +9,11 @@
 when 'RedHat'
   trusted_ca_file_remote = '/etc/pki/ca-trust/source/anchors/DigiCert_G5_TLS_ECC_SHA384_2021_CA1.crt'
   trusted_ca_file_text = '/etc/pki/ca-trust/source/anchors/InCommon.crt'
-  untrusted_ca_file_remote = '/etc/pki/ca-trust/source/blacklist/DigiCert_Global_Root_G3.crt'
+  untrusted_ca_file_remote = if host_inventory['facter']['os']['release']['major'] < '9'
+                               '/etc/pki/ca-trust/source/blacklist/DigiCert_Global_Root_G3.crt'
+                             else
+                               '/etc/pki/ca-trust/source/blocklist/DigiCert_Global_Root_G3.crt'
+                             end
   ca_certificates_bundle = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'
 when 'Archlinux'
   trusted_ca_file_remote = '/etc/ca-certificates/trust-source/anchors/DigiCert_G5_TLS_ECC_SHA384_2021_CA1.crt'

diff --git a/spec/defines/ca_spec.rb b/spec/defines/ca_spec.rb
@@ -15,7 +15,11 @@
       trusted_cert_dir    = '/usr/local/share/ca-certificates'
     when 'RedHat'
       trusted_cert_dir    = '/etc/pki/ca-trust/source/anchors'
-      distrusted_cert_dir = '/etc/pki/ca-trust/source/blacklist'
+      distrusted_cert_dir = if facts[:os]['release']['major'] < '9'
+                              '/etc/pki/ca-trust/source/blacklist'
+                            else
+                              '/etc/pki/ca-trust/source/blocklist'
+                            end
     when 'Archlinux'
       trusted_cert_dir    = '/etc/ca-certificates/trust-source/anchors'
       distrusted_cert_dir = '/etc/ca-certificates/trust-source/blacklist'