From 37c096e07832b4cb628e8990be8fc08c846c9595 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Tue, 20 Mar 2018 22:48:12 +0000 Subject: [PATCH] Use correct Fedora upstream repo --- postgres/osmap.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml index 23a1085..b590b12 100644 --- a/postgres/osmap.yaml +++ b/postgres/osmap.yaml @@ -31,11 +31,16 @@ RedHat: pkg_repo: name: pgdg{{ release }} humanname: PostgreSQL {{ repo.version }} $releasever - $basearch - baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch' gpgcheck: 1 gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}' + {% if grains.os == 'Fedora' %} + baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/fedora/fedora-$releasever-$basearch' + {% else %} + baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch' + {% endif %} -{% if repo.use_upstream_repo %} +{% if repo.use_upstream_repo == true %} + {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %} pkg: postgresql{{ release }}-server pkg_client: postgresql{{ release }}