From bfb158c0e3ee7e53464079b603f64bc559ca1a84 Mon Sep 17 00:00:00 2001
From: myii <myii@users.noreply.github.com>
Date: Wed, 6 Jun 2018 05:40:09 +0100
Subject: [PATCH 1/4] Prevent default `fromrepo` being evaluated as string
 'None'

Bare `fromrepo:` results in `{..., 'fromrepo': 'None', ...}`
---
 postgres/defaults.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 3a66a15..021ab1a 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -57,7 +57,7 @@ postgres:
 
   bake_image: False
 
-  fromrepo:
+  fromrepo: ''
 
   users: {}
   tablespaces: {}

From 6a77bbbecdeb4c6f23255dc72706a0699c8036ec Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 6 Jun 2018 16:04:29 +0100
Subject: [PATCH 2/4] Prevent remaining defaults from being evaluated as string
 'None'

---
 postgres/defaults.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 021ab1a..f84ba3d 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -32,8 +32,8 @@ postgres:
       url: https://github.com/PostgresApp/PostgresApp/releases/download/v2.1.1/Postgres-2.1.1.dmg
       sum: sha256=ac0656b522a58fd337931313f09509c09610c4a6078fe0b8e469e69af1e1750b
     homebrew:
-      url:
-      sum:
+      url: ''
+      sum: ''
     dl:
       opts: -s -L
       interval: 60
@@ -67,4 +67,4 @@ postgres:
 
   linux:
     #Alternatives system are disabled by a 'altpriority=0' pillar.
-    altpriority:
+    altpriority: 0

From 2c6483f235d2ef2c5e8cf6a1ca7a9900c740bc90 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 6 Jun 2018 16:02:30 +0100
Subject: [PATCH 3/4] Use `default` filter for `fromrepo` instead of `or`

---
 postgres/codenamemap.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
index 59a989a..a783282 100644
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -13,7 +13,7 @@
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
     {% set version = repo.version %}
-    {% set fromrepo = repo.fromrepo or name + '-pgdg' %}
+    {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
   {% else %}
     {% set fromrepo = name %}
   {% endif %}
@@ -38,7 +38,7 @@
 
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
-    {% set fromrepo = repo.fromrepo or name + '-pgdg' %}
+    {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
     {% set version = repo.version %}
   {% else %}
     {% set fromrepo = name %}

From cdca9108e0de37df02e983bd0f87dd03b1ecb906 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 6 Jun 2018 16:35:41 +0100
Subject: [PATCH 4/4] Add `fromrepo` to `pillar.example`

---
 pillar.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pillar.example b/pillar.example
index fe29f4d..48d0e07 100644
--- a/pillar.example
+++ b/pillar.example
@@ -4,6 +4,9 @@ postgres:
   use_upstream_repo: False
   # Version to install from upstream repository (if upstream_repo: True)
   version: '9.6'
+  # If automatic package installation fails, use `fromrepo` to specify the
+  # upstream repo to install packages from [#133, #185] (if upstream_repo: True)
+  fromrepo: 'jessie-pgdg'
 
   ### MACOS
   # Set to 'postgresapp' OR 'homebrew' for MacOS