Merge pull request #34 from alanpearce/upstream-repo

Add option to use upstream repo on Debian

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'

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:

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',