Skip to content

Commit

Permalink
Revert "Import RPM keys directly from URL" (#502)
Browse files Browse the repository at this point in the history
* Revert "Import RPM keys directly from URL (#475)"

This reverts commit 8c3e2a9.

* Fix lint and key 2028 import
  • Loading branch information
KevinFairise2 authored Jul 17, 2023
1 parent d3a9f63 commit 0fe67ae
Showing 1 changed file with 32 additions and 4 deletions.
36 changes: 32 additions & 4 deletions tasks/pkg-redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,55 @@
) else 'yes'
) }}
- name: Download current RPM key
get_url:
url: "{{ datadog_yum_gpgkey_current }}"
dest: /tmp/DATADOG_RPM_KEY_CURRENT.public
mode: 600
force: true

- name: Import current RPM key
rpm_key:
key: "{{ datadog_yum_gpgkey_current }}"
key: /tmp/DATADOG_RPM_KEY_CURRENT.public
state: present
when: not ansible_check_mode

- name: Download new RPM key (Expires in 2022)
get_url:
url: "{{ datadog_yum_gpgkey_e09422b3 }}"
dest: /tmp/DATADOG_RPM_KEY_E09422B3.public
mode: 600
checksum: "sha256:{{ datadog_yum_gpgkey_e09422b3_sha256sum }}"

- name: Import new RPM key (Expires in 2022)
rpm_key:
key: "{{ datadog_yum_gpgkey_e09422b3 }}"
key: /tmp/DATADOG_RPM_KEY_E09422B3.public
state: present
when: not ansible_check_mode

- name: Download new RPM key (Expires in 2024)
get_url:
url: "{{ datadog_yum_gpgkey_20200908 }}"
dest: /tmp/DATADOG_RPM_KEY_20200908.public
mode: 600
checksum: "sha256:{{ datadog_yum_gpgkey_20200908_sha256sum }}"

- name: Import new RPM key (Expires in 2024)
rpm_key:
key: "{{ datadog_yum_gpgkey_20200908 }}"
key: /tmp/DATADOG_RPM_KEY_20200908.public
state: present
when: not ansible_check_mode

- name: Download new RPM key (Expires in 2028)
get_url:
url: "{{ datadog_yum_gpgkey_20280418 }}"
dest: /tmp/DATADOG_RPM_KEY_20280418.public
mode: 600
checksum: "sha256:{{ datadog_yum_gpgkey_20280418_sha256sum }}"

- name: Import new RPM key (Expires in 2028)
rpm_key:
key: "{{ datadog_yum_gpgkey_20280418 }}"
key: /tmp/DATADOG_RPM_KEY_20280418.public
state: present
when: not ansible_check_mode

Expand Down

0 comments on commit 0fe67ae

Please sign in to comment.