[ansible/artifactory] Fix for #361 postgres_rpmkey_url (#362)

* Fix for #361 postgres_rpmkey_url * README * ChangeLog
jfrog · Jan 5, 2024 · 22f2c89 · 22f2c89
1 parent c5ff527
commit 22f2c89
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Platform Ansible Collection Changelog
 All changes to this collection will be documented in this file.
 
+## [10.16.5] - Jan 01, 2024
+* Postgres - change to the new location of the RPM GPG key URL.
+
 ## [10.16.4] - Dec 21, 2023
 * Artifactory - Upgrade version when tar is already present [GH-356](https://github.com/jfrog/JFrog-Cloud-Installers/pull/356)
 * Product Updates/fixes

diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/README.md b/Ansible/ansible_collections/jfrog/platform/roles/postgres/README.md
@@ -14,6 +14,11 @@ postgres_allowed_hosts:
 
 **Update this variable to only allow access from Artifactory, Distribution, Insight and Xray.**
 
+
+Since 2024-01-03 the GPG key has a new location.
+```
+postgres_rpmkey_url: "https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL"
+```
 ## Example Playbook
 ```
 ---
@@ -23,4 +28,4 @@ postgres_allowed_hosts:
     - community.general
   roles:
     - postgres
-```
+```
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml
@@ -7,6 +7,9 @@ postgres_listen_addresses: 0.0.0.0
 # Default port of Postgres server
 postgres_port: 5432
 
+# Location of GPG key used to sign the RPMs
+postgres_rpmkey_url: "https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL"
+
 # Server version in package:
 postgres_server_pkg_version: "{{ postgres_version | replace('.', '') }}"
 

diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml
@@ -37,7 +37,7 @@
 - name: Import PostgreSQL GPG public key
   become: true
   ansible.builtin.rpm_key:
-    key: https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG
+    key: "{{ postgres_rpmkey_url }}"
     state: present
   register: download_postgresql_key
   until: download_postgresql_key is success