mirror of
https://github.com/saltstack-formulas/postgres-formula.git
synced 2025-04-10 14:51:46 +00:00
fix(upstream): install keyring only in old versions
Solves #327: postgresql-common conflicts with pgdg-keyring Co-authored-by: teankie <remcomank@eleven.nl>
This commit is contained in:
parent
adf7c415b8
commit
12666c3b13
1 changed files with 3 additions and 0 deletions
|
@ -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:
|
||||
|
|
Loading…
Add table
Reference in a new issue