saltstack-formulas/postgres-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/postgres-formula.git synced 2025-04-17 10:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(upstream): install keyring only in old versions

Browse source 
Solves #327: postgresql-common conflicts with pgdg-keyring

Co-authored-by: teankie <remcomank@eleven.nl>
This commit is contained in:
teankie 2023-02-09 11:17:56 +01:00 • committed by GitHub
parent adf7c415b8
commit 12666c3b13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
postgres/upstream.sls
View file

@ -2,6 +2,7 @@
{%- from tpldir + "/macros.jinja" import format_kwargs with context -%} {%- from tpldir + "/macros.jinja" import format_kwargs with context -%}
{%- if 'pkg_repo' in postgres -%} {%- if 'pkg_repo' in postgres -%}
{% set pg_common_version = salt['pkg.version']('postgresql-common') %}
{%- if postgres.use_upstream_repo == true -%} {%- if postgres.use_upstream_repo == true -%}
@ -24,6 +25,7 @@ postgresql-pkg-deps:
# Add upstream repository for your distro # Add upstream repository for your distro
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
{% if salt['pkg.version_cmp'](pg_common_version, '246') <= 0 %}
postgresql-repo-keyring: postgresql-repo-keyring:
pkg.installed: pkg.installed:
- sources: - sources:
@ -31,6 +33,7 @@ postgresql-repo-keyring:
- require_in: - require_in:
- pkgrepo: postgresql-repo - pkgrepo: postgresql-repo
{%- endif %} {%- endif %}
{%- endif %}
postgresql-repo: postgresql-repo:
pkgrepo.managed: pkgrepo.managed: