Update postgres/osfamilymap.yaml

Changed more stuff about the gpg key... correct this time?

postgres/codenamemap.yaml

@@ -61,6 +61,7 @@
 {{ debian_codename('stretch', '9.6') }}
 {{ debian_codename('buster', '11') }}
 {{ debian_codename('bullseye', '13') }}
+{{ debian_codename('bookworm', '15') }}
 
 # `oscodename` grain has long distro name
 # if `lsb-release` package not installed
@@ -68,6 +69,7 @@
 {{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
 {{ debian_codename('buster', '11', 'Debian GNU/Linux 10 (buster)') }}
 {{ debian_codename('bullseye', '13', 'Debian GNU/Linux 11 (bullseye)') }}
+{{ debian_codename('bookworm', '15', 'Debian GNU/Linux 12 (bookworm)') }}
 
 ## Ubuntu
 # http://apt.postgresql.org/pub/repos/apt/dists/

postgres/osfamilymap.yaml

@@ -60,7 +60,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

@@ -2,6 +2,7 @@
 {%- from tpldir + "/macros.jinja" import format_kwargs with context -%}
 
 {%- if 'pkg_repo' in postgres -%}
+{% set pg_common_version = salt['pkg.version']('postgresql-common') %}
 
   {%- if postgres.use_upstream_repo == true -%}
 
@@ -24,6 +25,7 @@ postgresql-pkg-deps:
 
 # 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:
@@ -31,6 +33,7 @@ postgresql-repo-keyring:
     - require_in:
       - pkgrepo: postgresql-repo
   {%- endif %}
+  {%- endif %}
 
 postgresql-repo:
   pkgrepo.managed: