Make setting use_upstream_repo install PostgreSQL 9.5 by default

postgres/upstream.sls

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