From b317cebf18f5862a7aafb33cc4c67d8c1388e24d Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 1 Feb 2015 14:40:45 +0000 Subject: [PATCH] Add option to use upstream repo on Debian --- pillar.example | 2 ++ postgres/init.sls | 13 +++++++++++++ postgres/map.jinja | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index bec474e..15750ea 100644 --- a/pillar.example +++ b/pillar.example @@ -1,6 +1,8 @@ postgres: pg_hba.conf: salt://postgres/pg_hba.conf + use_upstream_repo: True + lookup: pkg: 'postgresql-9.3' pg_hba: '/etc/postgresql/9.3/main/pg_hba.conf' diff --git a/postgres/init.sls b/postgres/init.sls index cb06cb8..156a3ea 100644 --- a/postgres/init.sls +++ b/postgres/init.sls @@ -1,8 +1,21 @@ {% from "postgres/map.jinja" import postgres with context %} +{% if 'use_upstream_repo' in pillar.get('postgres') %} +install-postgresql-repo: + pkgrepo.managed: + - humanname: PostgreSQL Official Repository + - name: {{ postgres.pkg_repo }} + - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 + - keyserver: keyserver.ubuntu.com + - file: {{ postgres.pkg_repo_file }} + - require_in: + - install-postgresql +{% endif %} + install-postgresql: pkg.installed: - name: {{ postgres.pkg }} + - refresh: {{ 'use_upstream_repo' in pillar.get('postgres') }} {% if postgres.create_cluster != False %} create-postgresql-cluster: diff --git a/postgres/map.jinja b/postgres/map.jinja index 4ec03fe..d1b94cf 100644 --- a/postgres/map.jinja +++ b/postgres/map.jinja @@ -34,9 +34,11 @@ 'version' : pg_version.id, }, 'Debian': { - 'pkg' : 'postgresql', + 'pkg' : 'postgresql-' + pg_version.id, 'pkg_dev' : 'postgresql-server-dev-' + pg_version.id, 'pkg_libpq_dev' : 'libpq-dev', + 'pkg_repo' : 'deb http://apt.postgresql.org/pub/repos/apt/ ' + grains['lsb_distrib_codename'] + '-pgdg main', + 'pkg_repo_file' : '/etc/apt/sources.list.d/pgdg.list', 'python' : 'python-pygresql', 'service' : 'postgresql', 'pg_hba' : '/etc/postgresql/' + pg_version.id + '/main/pg_hba.conf',