From ea695fa7d68e47431b6b776b9b2094d75e19c291 Mon Sep 17 00:00:00 2001 From: YetAnotherMinion Date: Sun, 5 Feb 2017 13:12:53 -0600 Subject: [PATCH] Support upstream repo for Fedora 25, 24, and 23 Resolves #143 Add a macro to override base_url for upstream package url using the grain from 3 most recent Fedora distributions --- postgres/codenamemap.yaml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index eb98aa1..ab57a8b 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -34,6 +34,32 @@ {% endmacro %} + +{% macro fedora_codename(name, version, codename=none) %} + {# + Generate lookup dictionary map for Fedora distributions + + name: + distro codename + version: + PostgreSQL release version + codename: + optional grain value if `name` does not match the one returned by + `oscodename` grain + #} + + {# use upstream version if configured #} + {% if repo.use_upstream_repo %} + {% set version = repo.version %} + {% endif %} + +{{ codename|default(name, true) }}: + # PostgreSQL packages are mostly downloaded from `main` repo component + pkg_repo: + baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ version }}/fedora/fedora-$releasever-$basearch' + +{% endmacro %} + ## Debian GNU/Linux {{ debian_codename('wheezy', '9.1') }} {{ debian_codename('jessie', '9.4') }} @@ -51,4 +77,10 @@ {{ debian_codename('wily', '9.4') }} {{ debian_codename('xenial', '9.5') }} +## Fedora +# `oscodename` grain has long distro name +{{ fedora_codename('Fedora-25', '9.5', 'Fedora 25 (Twenty Five)') }} +{{ fedora_codename('Fedora-24', '9.5', 'Fedora 24 (Twenty Four)') }} +{{ fedora_codename('Fedora-23', '9.4', 'Fedora 23 (Twenty Three)') }} + # vim: ft=sls