Set use_upstream_repo: True by default

This commit is contained in:
Denys Havrysh
2016-09-23 17:50:57 +03:00
parent b4edec9f43
commit 84713e8fea
6 changed files with 38 additions and 21 deletions

View File

@@ -1,5 +1,6 @@
{% set version = salt['pillar.get']('postgres:version', '9.5') %}
{% set release = version|replace('.', '') %}
{% import_yaml "postgres/repo.yaml" as repo %}
{% set release = repo.version|replace('.', '') %}
Arch:
conf_dir: /var/lib/postgres/data
@@ -29,17 +30,17 @@ OpenBSD:
RedHat:
pkg_repo:
name: pgdg{{ release }}
humanname: PostgreSQL {{ version }} $releasever - $basearch
baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ version }}/redhat/rhel-$releasever-$basearch'
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 salt['pillar.get']('postgres:use_upstream_repo', false) %}
{% if repo.use_upstream_repo %}
pkg: postgresql{{ release }}-server
pkg_client: postgresql{{ release }}
conf_dir: /var/lib/pgsql/{{ version }}/data
service: postgresql-{{ version }}
conf_dir: /var/lib/pgsql/{{ repo.version }}/data
service: postgresql-{{ repo.version }}
{% else %}