From b2844c4b3a0713729c5fa5d87f82b3c6a7becb89 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 12 Nov 2023 17:26:58 +1100
Subject: [PATCH] fix: updated path for gpg keys

---
 site/profiles/manifests/yum/base.pp | 10 +++++-----
 site/profiles/manifests/yum/epel.pp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/profiles/manifests/yum/base.pp b/site/profiles/manifests/yum/base.pp
index 48c38f0..df86cd0 100644
--- a/site/profiles/manifests/yum/base.pp
+++ b/site/profiles/manifests/yum/base.pp
@@ -46,7 +46,7 @@ class profiles::yum::base (
       descr   => 'base repository',
       target  => '/etc/yum.repos.d/base.repo',
       baseurl => "${baseurl}/${release}/BaseOS-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/RPM-GPG-KEY-${facts['os']['name']}",
+      gpgkey  => "${baseurl}/${release}/BaseOS-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
     }
   }
 
@@ -56,7 +56,7 @@ class profiles::yum::base (
       descr   => 'extras repository',
       target  => '/etc/yum.repos.d/extras.repo',
       baseurl => "${baseurl}/${release}/extras-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/RPM-GPG-KEY-${facts['os']['name']}",
+      gpgkey  => "${baseurl}/${release}/extras-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
     }
   }
 
@@ -66,7 +66,7 @@ class profiles::yum::base (
       descr   => 'appstream repository',
       target  => '/etc/yum.repos.d/appstream.repo',
       baseurl => "${baseurl}/${release}/AppStream-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/RPM-GPG-KEY-${facts['os']['name']}",
+      gpgkey  => "${baseurl}/${release}/AppStream-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
     }
   }
 
@@ -76,7 +76,7 @@ class profiles::yum::base (
       descr   => 'powertools repository',
       target  => '/etc/yum.repos.d/powertools.repo',
       baseurl => "${baseurl}/${release}/PowerTools-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/RPM-GPG-KEY-${facts['os']['name']}",
+      gpgkey  => "${baseurl}/${release}/PowerTools-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
     }
   }
 
@@ -86,7 +86,7 @@ class profiles::yum::base (
       descr   => 'highavailability repository',
       target  => '/etc/yum.repos.d/highavailability.repo',
       baseurl => "${baseurl}/${release}/HighAvailability-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/RPM-GPG-KEY-${facts['os']['name']}",
+      gpgkey  => "${baseurl}/${release}/HighAvailability-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
     }
   }
 }
diff --git a/site/profiles/manifests/yum/epel.pp b/site/profiles/manifests/yum/epel.pp
index f0e39d9..575e099 100644
--- a/site/profiles/manifests/yum/epel.pp
+++ b/site/profiles/manifests/yum/epel.pp
@@ -42,7 +42,7 @@ class profiles::yum::epel (
       descr   => 'epel repository',
       target  => '/etc/yum.repos.d/epel.repo',
       baseurl => "${baseurl}/${release}/Everything-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/RPM-GPG-KEY-EPEL-${release}",
+      gpgkey  => "${baseurl}/${release}/Everything-${snapshot}/${basearch}/os/RPM-GPG-KEY-EPEL-${release}",
     }
   }
 }