fix(osfamilymap): gpg keyring urls for debian and redhat

postgres/codenamemap.yaml

@@ -29,7 +29,7 @@
   data_dir: {{ data_dir }}
   fromrepo: {{ fromrepo }}
   pkg_repo:
-    name: 'deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.gpg] http://apt.postgresql.org/pub/repos/apt {{ name }}-pgdg main'
+    name: 'deb http://apt.postgresql.org/pub/repos/apt {{ name }}-pgdg main'
   pkg: postgresql-{{ version }}
   pkg_client: postgresql-client-{{ version }}
   prepare_cluster:

postgres/osfamilymap.yaml

@@ -17,7 +17,8 @@ Debian:
   pkg_repo:
     humanname: PostgreSQL Official Repository
     file: /etc/apt/sources.list.d/pgdg.list
-  pkg_repo_keyring: 'https://download.postgresql.org/pub/repos/apt/pool/main/p/pgdg-keyring/pgdg-keyring_2018.2_all.deb'
+    key_url: https://download.postgresql.org/pub/repos/apt/ACCC4CF8.asc
+    name: deb https://apt.postgresql.org/pub/repos/apt {{ grains.get('oscodename') }}-pgdg main
   pkg_repo_keyid: ACCC4CF8
     {% if repo.use_upstream_repo == true %}
   pkg_dev: ''
@@ -60,7 +61,7 @@ RedHat:
     name: pgdg{{ release }}
     humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
     gpgcheck: 1
-    gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
+    gpgkey: 'https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL'
     baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'
 
   pkgs_deps:

postgres/upstream.sls

@@ -12,7 +12,7 @@ postgresql-profile:
     - name: /etc/profile.d/postgres.sh
     - user: root
     - group: root
-    - mode: 644
+    - mode: '0644'
     - template: jinja
     - source: salt://postgres/templates/postgres.sh.j2
     - defaults:
@@ -24,23 +24,11 @@ postgresql-pkg-deps:
     - pkgs: {{ postgres.pkgs_deps | json }}
 
 # Add upstream repository for your distro
-  {% if grains.os_family == 'Debian' %}
-  {% if salt['pkg.version_cmp'](pg_common_version, '246') <= 0 %}
-postgresql-repo-keyring:
-  pkg.installed:
-    - sources:
-      - pgdg-keyring: {{ postgres.pkg_repo_keyring }}
-    - require_in:
-      - pkgrepo: postgresql-repo
-  {%- endif %}
-  {%- endif %}
-
 postgresql-repo:
   pkgrepo.managed:
     {{- format_kwargs(postgres.pkg_repo) }}
     - require:
       - pkg: postgresql-pkg-deps
-
   {%- else -%}
 
 # Remove the repo configuration (and GnuPG key) as requested
@@ -51,12 +39,6 @@ postgresql-repo:
     - keyid: {{ postgres.pkg_repo_keyid }}
     {%- endif %}
 
-    {% if grains.os_family == 'Debian' %}
-postgresql-repo-keyring:
-  pkg.removed:
-    - name: pgdg-keyring
-    {%- endif -%}
-
   {%- endif -%}
 
 {%- elif grains.os not in ('Windows', 'MacOS',) %}

test/integration/repo/controls/repository.rb

@@ -18,30 +18,8 @@
   repo_file = os_name_repo_file[platform.name]
 
 when 'debian'
-  repo_keyring = '/usr/share/postgresql-common/pgdg/apt.postgresql.org.gpg'
   repo_file = '/etc/apt/sources.list.d/pgdg.list'
-  # rubocop:disable Layout/LineLength
-  repo_url = "deb [signed-by=#{repo_keyring}] http://apt.postgresql.org/pub/repos/apt #{system.platform[:codename]}-pgdg main"
-  # rubocop:enable Layout/LineLength
-end
-
-control 'Postgresql repository keyring' do
-  title 'should be installed'
-
-  only_if('Requirement for Debian family') do
-    os.debian?
-  end
-
-  describe package('pgdg-keyring') do
-    it { should be_installed }
-  end
-
-  describe file(repo_keyring) do
-    it { should exist }
-    it { should be_owned_by 'root' }
-    it { should be_grouped_into 'root' }
-    its('mode') { should cmp '0644' }
-  end
+  repo_url = "deb http://apt.postgresql.org/pub/repos/apt #{system.platform[:codename]}-pgdg main"
 end
 
 control 'Postgresql repository' do