From 97af59e701a2aba1187f1fdd10f1c086a59c2a74 Mon Sep 17 00:00:00 2001 From: Chris Price Date: Fri, 7 Dec 2012 11:34:30 -0800 Subject: [PATCH] Fix GPG key for yum.postgresl.org The GPG key for yum.postgresql.org was in the wrong directory, and as written, would have only supported postgres 9.2 anyway. I looked at the yum rpms for a few other versions besides 9.2, and they appear to be using the same GPG key. So this commit assumes that they all are doing so, and it sets things up accordingly. Hopefully this will make the yumrepo support compatible with other versions of postgres besides 9.2, but I haven't added that to the actual test matrix yet. --- .../files/RPM-GPG-KEY-PGDG-92 => files/RPM-GPG-KEY-PGDG | 0 manifests/package_source/yum_postgresql_org.pp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename spec/test_module/files/RPM-GPG-KEY-PGDG-92 => files/RPM-GPG-KEY-PGDG (100%) diff --git a/spec/test_module/files/RPM-GPG-KEY-PGDG-92 b/files/RPM-GPG-KEY-PGDG similarity index 100% rename from spec/test_module/files/RPM-GPG-KEY-PGDG-92 rename to files/RPM-GPG-KEY-PGDG diff --git a/manifests/package_source/yum_postgresql_org.pp b/manifests/package_source/yum_postgresql_org.pp index bdd33ca..f755351 100644 --- a/manifests/package_source/yum_postgresql_org.pp +++ b/manifests/package_source/yum_postgresql_org.pp @@ -6,7 +6,7 @@ class postgresql::package_source::yum_postgresql_org( $package_version = "${version_parts[0]}${version_parts[1]}" file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}": - source => "puppet:///modules/postgresql_tests/RPM-GPG-KEY-PGDG-${package_version}" + source => "puppet:///modules/postgresql/RPM-GPG-KEY-PGDG" } -> yumrepo { "yum.postgresql.org":