From 039a4222f540f3bf5daba462b4b4858c874a2c5d Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Tue, 2 Jan 2024 22:15:07 -0800
Subject: [PATCH] repo/apt_postgresql_org: use modern APT keyrings

This makes use of https://github.com/puppetlabs/puppetlabs-apt/pull/1128
to store the public key in /etc/apt/keyrings and add a signed-by
option to the sources.list.d entry.
---
 manifests/repo/apt_postgresql_org.pp | 2 +-
 metadata.json                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/repo/apt_postgresql_org.pp b/manifests/repo/apt_postgresql_org.pp
index 31b591a0f0..f4a39fd294 100644
--- a/manifests/repo/apt_postgresql_org.pp
+++ b/manifests/repo/apt_postgresql_org.pp
@@ -20,7 +20,7 @@
     repos        => 'main',
     architecture => $facts['os']['architecture'],
     key          => {
-      id     => 'B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8',
+      name   => 'apt.postgresql.org.asc',
       source => 'https://www.postgresql.org/media/keys/ACCC4CF8.asc',
     },
     include      => {
diff --git a/metadata.json b/metadata.json
index 8f8e381b9d..7d91d19e91 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs/apt",
-      "version_requirement": ">= 2.0.0 < 10.0.0"
+      "version_requirement": ">= 9.2.0 < 10.0.0"
     },
     {
       "name": "puppet/systemd",