From 53a9fc2f955ac7322c62dc54b261ff9addac51c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20=E2=80=9Csaz=E2=80=9D=20Zieger?= <github@saz.sh>
Date: Tue, 3 Dec 2024 10:05:57 +0100
Subject: [PATCH] use new apt per-source key

---
 manifests/params.pp | 36 ++++++++++++++++++------------------
 metadata.json       |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9fd917d..90ac522 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -16,64 +16,64 @@
         $_admin_listen_socket = "${datadir}/proxysql_admin.sock"
       }
 
-      $repo22             = {
+      $repo22 = {
         comment  => 'ProxySQL 2.2.x APT repository',
         location => "http://repo.proxysql.com/ProxySQL/proxysql-2.2.x/${facts['os']['distro']['codename']}/",
         release  => './',
         repos    => ' ',
         key      => {
-          'id'     => '1448BF693CA600C799EB935804A562FB79953B49',
-          'server' => 'keyserver.ubuntu.com',
+          'name'   => 'proxysql-2.2.x.asc',
+          'source' => 'https://repo.proxysql.com/ProxySQL/proxysql-2.2.x/repo_pub_key',
         },
       }
-      $repo23             = {
+      $repo23 = {
         comment  => 'ProxySQL 2.3.x APT repository',
         location => "http://repo.proxysql.com/ProxySQL/proxysql-2.3.x/${facts['os']['distro']['codename']}/",
         release  => './',
         repos    => ' ',
         key      => {
-          'id'     => '1448BF693CA600C799EB935804A562FB79953B49',
-          'server' => 'keyserver.ubuntu.com',
+          'name'   => 'proxysql-2.3.x.asc',
+          'source' => 'https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/repo_pub_key',
         },
       }
-      $repo24             = {
+      $repo24 = {
         comment  => 'ProxySQL 2.4.x APT repository',
         location => "http://repo.proxysql.com/ProxySQL/proxysql-2.4.x/${facts['os']['distro']['codename']}/",
         release  => './',
         repos    => ' ',
         key      => {
-          'id'     => '653F85BB38256DF8A96206C3E8CA2E8D8217C97E',
-          'server' => 'keyserver.ubuntu.com',
+          'name'   => 'proxysql-2.4.x.asc',
+          'source' => 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key',
         },
       }
-      $repo25             = {
+      $repo25 = {
         comment  => 'ProxySQL 2.5.x APT repository',
         location => "http://repo.proxysql.com/ProxySQL/proxysql-2.5.x/${facts['os']['distro']['codename']}/",
         release  => './',
         repos    => ' ',
         key      => {
-          'id'     => '653F85BB38256DF8A96206C3E8CA2E8D8217C97E',
-          'server' => 'keyserver.ubuntu.com',
+          'name'   => 'proxysql-2.5.x.asc',
+          'source' => 'https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/repo_pub_key',
         },
       }
-      $repo26             = {
+      $repo26 = {
         comment  => 'ProxySQL 2.6.x APT repository',
         location => "http://repo.proxysql.com/ProxySQL/proxysql-2.6.x/${facts['os']['distro']['codename']}/",
         release  => './',
         repos    => ' ',
         key      => {
-          'id'     => '653F85BB38256DF8A96206C3E8CA2E8D8217C97E',
-          'server' => 'keyserver.ubuntu.com',
+          'name'   => 'proxysql-2.6.x.asc',
+          'source' => 'https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/repo_pub_key',
         },
       }
-      $repo27             = {
+      $repo27 = {
         comment  => 'ProxySQL 2.7.x APT repository',
         location => "http://repo.proxysql.com/ProxySQL/proxysql-2.7.x/${facts['os']['distro']['codename']}/",
         release  => './',
         repos    => ' ',
         key      => {
-          'id'     => '653F85BB38256DF8A96206C3E8CA2E8D8217C97E',
-          'server' => 'keyserver.ubuntu.com',
+          'name'   => 'proxysql-2.7.x.asc',
+          'source' => 'https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/repo_pub_key',
         },
       }
     }
diff --git a/metadata.json b/metadata.json
index 5c70141..fef1c8f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs-apt",
-      "version_requirement": ">= 2.1.0 < 10.0.0"
+      "version_requirement": ">= 9.2.0 < 10.0.0"
     },
     {
       "name": "puppetlabs-stdlib",