Skip to content

Commit

Permalink
fix(upstream): install keyring only in old versions
Browse files Browse the repository at this point in the history
Solves #327: postgresql-common conflicts with pgdg-keyring

Co-authored-by: teankie <[email protected]>
  • Loading branch information
teankie and teankie authored Feb 9, 2023
1 parent adf7c41 commit 12666c3
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions postgres/upstream.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%}
Expand All @@ -24,13 +25,15 @@ 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:
- pgdg-keyring: {{ postgres.pkg_repo_keyring }}
- require_in:
- pkgrepo: postgresql-repo
{%- endif %}
{%- endif %}
postgresql-repo:
pkgrepo.managed:
Expand Down

0 comments on commit 12666c3

Please sign in to comment.