specific GPG key for RH7

puppetlabs · Jan 5, 2024 · e8c1db2 · e8c1db2
1 parent 12ed576
commit e8c1db2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/files/RPM-GPG-KEY-PGDG-common → files/RPM-GPG-KEY-PGDG-7 b/files/RPM-GPG-KEY-PGDG-common → files/RPM-GPG-KEY-PGDG-7
diff --git a/manifests/repo/yum_postgresql_org.pp b/manifests/repo/yum_postgresql_org.pp
@@ -1,24 +1,20 @@
 # @api private
 class postgresql::repo::yum_postgresql_org inherits postgresql::repo {
-  $version_parts       = split($postgresql::repo::version, '[.]')
-  $package_version     = "${version_parts[0]}${version_parts[1]}"
-  $gpg_key_path        = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"
-  $gpg_key_path_common = '/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-common'
+  $version_parts   = split($postgresql::repo::version, '[.]')
+  $package_version = "${version_parts[0]}${version_parts[1]}"
+  $gpg_key_path    = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"
 
-  file { $gpg_key_path:
-    content => file('postgresql/RPM-GPG-KEY-PGDG'),
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    before  => Yumrepo['yum.postgresql.org'],
+  $gpg_key_file = $facts['os']['release']['major'] ? {
+    '7'     => 'postgresql/RPM-GPG-KEY-PGDG-7',
+    default => 'postgresql/RPM-GPG-KEY-PGDG',
   }
 
-  file { $gpg_key_path_common:
-    content => file('postgresql/RPM-GPG-KEY-PGDG-common'),
+  file { $gpg_key_path:
+    content => file($gpg_key_file),
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    before  => Yumrepo['pgdg-common'],
+    before  => Yumrepo['yum.postgresql.org'],
   }
 
   if($facts['os']['name'] == 'Fedora') {
@@ -39,7 +35,7 @@
     baseurl  => $_baseurl,
     enabled  => 1,
     gpgcheck => 1,
-    gpgkey   => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}",
+    gpgkey   => "file://${gpg_key_path}",
     proxy    => $postgresql::repo::proxy,
   }
 
@@ -48,7 +44,7 @@
     baseurl  => $_commonurl,
     enabled  => 1,
     gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-common',
+    gpgkey   => "file://${gpg_key_path}",
     proxy    => $postgresql::repo::proxy,
   }