diff --git a/defaults/main.yml b/defaults/main.yml index f19f292bd0aadc9209e06501ce022c0abb5881cf..aec7609dcd90e744ad4ded4bfee10d58b9b8f276 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,4 @@ --- ca_trust_certificates: [] +ca_trust_cert_path: "{{ '/etc/pki/ca-trust/source/anchors/' if ansible_os_family == 'RedHat' else '/usr/local/share/ca-certificates' }}" +ca_trust_update_ca_cmd: "{{ 'update-ca-trust' if ansible_os_family == 'RedHat' else 'update-ca-certificates' }}" diff --git a/handlers/main.yml b/handlers/main.yml index 414129d6e59f945cfb3a6d2730ba76cac928e905..2dc83a486e24cc87ffcdc07b7cb1dee7299c0bae 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,3 +1,3 @@ --- - name: Update CA trust - command: update-ca-trust + command: "{{ ca_trust_update_ca_cmd }}" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 414889c789a5c64f091c0cc906fa2a351686e85c..5e6c2ce048d2dad856784d7bb3cf3a5fbd96aafb 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -47,3 +47,7 @@ platforms: image: centos:7 groups: - molecule_group + - name: ca-trust-ubuntu + image: ubuntu:20.04 + groups: + - molecule_group diff --git a/tasks/main.yml b/tasks/main.yml index 9e093622f24a1da063ab87030d4e068c11ce8870..aa0bf045486fe90150ce635fe75f59ca6f3f14c3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: Install ca-certificates - yum: + package: name: ca-certificates - name: Add certificates to trust store copy: content: "{{ item.certificate }}" - dest: "/etc/pki/ca-trust/source/anchors/{{ item.name }}.crt" + dest: "{{ ca_trust_cert_path }}/{{ item.name }}.crt" owner: root group: root mode: 0644