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

Merge pull request #120 from vutny/use_upstream_repo-9.5

Browse source 
Make setting `use_upstream_repo` install PostgreSQL 9.5 by default
This commit is contained in:
Forrest 2016-09-13 09:34:45 -07:00 • committed by GitHub
commit 414f117011
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
postgres/codenamemap.yaml
View file

@ -5,7 +5,8 @@
{% endif %} {% endif %}
{{ name }}: {{ name }}:
pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main pkg_repo_humanname: PostgreSQL Official Repository
pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main {{ version }}
pkg: postgresql-{{ version }} pkg: postgresql-{{ version }}
pkg_client: postgresql-client-{{ version }} pkg_client: postgresql-client-{{ version }}
conf_dir: /etc/postgresql/{{ version }}/main conf_dir: /etc/postgresql/{{ version }}/main

3
postgres/osmap.yaml
View file

@ -24,8 +24,9 @@ RedHat:
{% set version = salt['pillar.get']('postgres:version', '9.5') %} {% set version = salt['pillar.get']('postgres:version', '9.5') %}
{% set release = version|replace('.', '') %} {% set release = version|replace('.', '') %}
version: {{ version }}
pkg_repo: pgdg{{ release }} pkg_repo: pgdg{{ release }}
pkg_repo_humanname: PostgreSQL {{ version }} $releasever - $basearch
pkg_repo_url: https://download.postgresql.org/pub/repos/yum/{{ version }}/redhat/rhel-$releasever-$basearch
pkg: postgresql{{ release }}-server pkg: postgresql{{ release }}-server
pkg_client: postgresql{{ release }} pkg_client: postgresql{{ release }}
conf_dir: /var/lib/pgsql/{{ version }}/data conf_dir: /var/lib/pgsql/{{ version }}/data

13
postgres/upstream.sls
View file

@ -1,11 +1,11 @@
{%- from "postgres/map.jinja" import postgres with context %} {%- from "postgres/map.jinja" import postgres with context %}
{%- if grains['os_family'] == 'Debian' %} {%- if grains['os_family'] == 'Debian' -%}
install-postgresql-repo: install-postgresql-repo:
pkgrepo.managed: pkgrepo.managed:
- humanname: PostgreSQL Official Repository - humanname: {{ postgres.pkg_repo_humanname }}
- name: {{ postgres.pkg_repo }} {{ postgres.version }} - name: {{ postgres.pkg_repo }}
- keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
- keyserver: keyserver.ubuntu.com - keyserver: keyserver.ubuntu.com
- file: {{ postgres.pkg_repo_file }} - file: {{ postgres.pkg_repo_file }}
@ -21,12 +21,13 @@ install-postgresql-repo:
- source_hash: md5=78b5db170d33f80ad5a47863a7476b22 - source_hash: md5=78b5db170d33f80ad5a47863a7476b22
pkgrepo.managed: pkgrepo.managed:
- name: {{ postgres.pkg_repo }} - name: {{ postgres.pkg_repo }}
- order: 1 - humanname: {{ postgres.pkg_repo_humanname }}
- humanname: PostgreSQL {{ postgres.version }} $releasever - $basearch - baseurl: {{ postgres.pkg_repo_url }}
- baseurl: https://download.postgresql.org/pub/repos/yum/{{ postgres.version }}/redhat/rhel-$releasever-$basearch
- gpgcheck: 1 - gpgcheck: 1
- gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG - gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG
- require: - require:
- file: install-postgresql-repo - file: install-postgresql-repo
- require_in:
- pkg: postgresql-installed
{%- endif %} {%- endif %}