From 880ad1d3d552945ab681ffcb8e444dde9cd5fd73 Mon Sep 17 00:00:00 2001
From: Ulrich Schwickerath <ulrich.schwickerath@cern.ch>
Date: Wed, 3 Nov 2021 09:43:26 +0100
Subject: [PATCH 1/2] import new puppet key

---
 gpgkeys/RPM-GPG-KEY-puppet-20250406 | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 gpgkeys/RPM-GPG-KEY-puppet-20250406

diff --git a/gpgkeys/RPM-GPG-KEY-puppet-20250406 b/gpgkeys/RPM-GPG-KEY-puppet-20250406
new file mode 100644
index 0000000..333b379
--- /dev/null
+++ b/gpgkeys/RPM-GPG-KEY-puppet-20250406
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFyrv4oBEADhL8iyDPZ+GWN7L+A8dpEpggglxTtL7qYNyN5Uga2j0cusDdOD
+ftPHsurLjfxtc2EFGdFK/N8y4LSpq+nOeazhkHcPeDiWC2AuN7+NGjH9LtvMUqKy
+NWPhPYP2r/xPL547oDMdvLXDH5n+FsLFW8QgATHk4AvlIhGng0gWu80OqTCiL0HC
+W7TftkF8ofP8k90SnLYbI9HDVOj6VYYtqG5NeoCHGAqrb79G/jq64Z/gLktD3IrB
+CxYhKFfJtZ/BSDB8Aa4ht+jIyeFCNSbGyfFfWlHKvF3JngS/76Y7gxX1sbR3gHJQ
+hO25AQdsPYKxgtIgNeB9/oBp1+V3K1W/nta4gbDVwJWCqDRbEFlHIdV7fvV/sqiI
+W7rQ60aAY7J6Gjt/aUmNArvT8ty3szmhR0wEEU5/hhIVV6VjS+AQsI8pFv6VB8bJ
+TLfOBPDW7dw2PgyWhVTEN8KW/ckyBvGmSdzSgAhw+rAe7li50/9e2H8eiJgBbGid
+8EQidZgkokh331CMDkIA6F3ygiB+u2ZZ7ywxhxIRO70JElIuIOiofhVfRnh/ODlH
+X7eD+cA2rlLQd2yWf4diiA7C9R8r8vPrAdp3aPZ4xLxvYYZV8E1JBdMus5GRy4rB
+Avetp0Wx/1r9zVDKD/J1bNIlt0SR9FTmynZj4kLWhoCqmbrLS35325sS6wARAQAB
+tEhQdXBwZXQsIEluYy4gUmVsZWFzZSBLZXkgKFB1cHBldCwgSW5jLiBSZWxlYXNl
+IEtleSkgPHJlbGVhc2VAcHVwcGV0LmNvbT6JAlQEEwEKAD4WIQTWgR7Tre64RBr1
+qo9FKLbNnmHvJgUCXKu/igIbAwUJC0c1AAULCQgHAwUVCgkICwUWAgMBAAIeAQIX
+gAAKCRBFKLbNnmHvJg/vD/0eOl/pBb6ooGnzg2qoD+XwgOK3HkTdvGNZKGsIrhUG
+q6O0zoyPW8v9b/i7QEDre8QahARmMAEQ+T3nbNVzw4kpE+YIrEkKjoJsrF8/K/1L
+zBHJCc3S9oF9KubG5BuQ4bAmcvnI+qpEYbSTLHztYGUfXAGu+MnaDf4C60G7zM6m
+ec4bX8lVnt+gcsGGGCdN89XsZLBNdv21z9xMeaAPiRYJpbqwrb8cYbKQeqFSQt2M
+UylN5oVeN77Q8iyXSyVwpc6uKzXdQ8bVPbKUTWSXQ4SSp0HJjtAMiDH2pjty4PG6
+EgZ6/njJLOzQ29ZgFrS19XLONlptHwKzLYB8nJhJvGHfzzInmNttDtNwTA6IxpsR
+4aCnrPWFJRCbmMBNXvBR9B/O+e/T5ngL21ipMEwzEOiQlRSacnO2pICwZ5pARMRI
+dxq/5BQYry9HNlJDGR7YIfn7i0oCGk5BxwotSlAPw8jFpNU/zTOvpQAdPvZje2JP
+6GS+hYxSdHsigREXI2gxTvpcLk8LOe9PsqJv631e6Kvn9P9OHiihIp8G9fRQ8T7y
+elHcNanV192mfbWxJhDAcQ+JEy9883lOanaCoaf/7z4kdmCQLz5/oNg2K0qjSgZH
+JY/gxCOwuAuUJlLcAXQG6txJshfMxyQUO46DXg0/gjwkKgT/9PbTJEN/WN/G6n1h
+lQ==
+=nKF2
+-----END PGP PUBLIC KEY BLOCK-----
+
-- 
GitLab


From 3d953129adbe566cb384ae025f93cd405171bbc2 Mon Sep 17 00:00:00 2001
From: Ulrich Schwickerath <ulrich.schwickerath@cern.ch>
Date: Wed, 3 Nov 2021 09:47:25 +0100
Subject: [PATCH 2/2] use new key for puppet mirror

---
 prod.repos.d/puppetlabs.repo | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/prod.repos.d/puppetlabs.repo b/prod.repos.d/puppetlabs.repo
index 951a0ae..e4917df 100644
--- a/prod.repos.d/puppetlabs.repo
+++ b/prod.repos.d/puppetlabs.repo
@@ -2,27 +2,27 @@
 [puppet6_el7]
 name=Puppet 6 Repository el 7 - x86_64
 baseurl=http://yum.puppetlabs.com/puppet6/el/7/x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406
 enabled=1
 gpgcheck=1
 
 [puppet6_el8]
 name=Puppet 6 Repository el 8 - x86_64
 baseurl=http://yum.puppetlabs.com/puppet6/el/8/x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406
 enabled=1
 gpgcheck=1
 
 [puppet7_el7]
 name=Puppet 7 Repository el 7 - x86_64
 baseurl=http://yum.puppetlabs.com/puppet7/el/7/x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406
 enabled=1
 gpgcheck=1
 
 [puppet7_el8]
 name=Puppet 7 Repository el 8 - x86_64
 baseurl=http://yum.puppetlabs.com/puppet7/el/8/x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406
 enabled=1
 gpgcheck=1
-- 
GitLab