From da6ec356dab75f0fecbc98e49420ac37ae7c5f34 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Thu, 4 Jan 2024 13:55:46 +0100 Subject: [PATCH 1/3] Fix for #361 postgres_rpmkey_url --- .../jfrog/platform/roles/postgres/defaults/main.yml | 3 +++ .../jfrog/platform/roles/postgres/tasks/RedHat.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml index 7772a8b1..9a729efb 100644 --- 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 index db98a20d..110ebf34 100644 --- 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 From 8cfedff22ca863a58fede975b0163297f14f9f48 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Thu, 4 Jan 2024 13:58:33 +0100 Subject: [PATCH 2/3] README --- .../jfrog/platform/roles/postgres/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/README.md b/Ansible/ansible_collections/jfrog/platform/roles/postgres/README.md index 026e9490..e4be8f38 100644 --- 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 -``` \ No newline at end of file +``` From 97e498300bc90b1eebcefa731cd614b7aaa51709 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Thu, 4 Jan 2024 13:59:54 +0100 Subject: [PATCH 3/3] ChangeLog --- Ansible/ansible_collections/jfrog/platform/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index 48ae1693..2934b656 100644 --- 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