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 #217 from myii/patch-2

Browse source 
Prevent default `fromrepo` being evaluated as string 'None'
This commit is contained in:
N 2018-06-06 19:45:11 +01:00 • committed by GitHub
commit 800259dffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pillar.example
View file

@ -4,6 +4,9 @@ postgres:
use_upstream_repo: False use_upstream_repo: False
# Version to install from upstream repository (if upstream_repo: True) # Version to install from upstream repository (if upstream_repo: True)
version: '9.6' 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 ### MACOS
# Set to 'postgresapp' OR 'homebrew' for MacOS # Set to 'postgresapp' OR 'homebrew' for MacOS

4
postgres/codenamemap.yaml
View file

@ -13,7 +13,7 @@
{# use upstream version if configured #} {# use upstream version if configured #}
{% if repo.use_upstream_repo == true %} {% if repo.use_upstream_repo == true %}
{% set version = repo.version %} {% set version = repo.version %}
{% set fromrepo = repo.fromrepo or name + '-pgdg' %} {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
{% else %} {% else %}
{% set fromrepo = name %} {% set fromrepo = name %}
{% endif %} {% endif %}
@ -38,7 +38,7 @@
{# use upstream version if configured #} {# use upstream version if configured #}
{% if repo.use_upstream_repo == true %} {% 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 %} {% set version = repo.version %}
{% else %} {% else %}
{% set fromrepo = name %} {% set fromrepo = name %}

8
postgres/defaults.yaml
View file

@ -32,8 +32,8 @@ postgres:
url: https://github.com/PostgresApp/PostgresApp/releases/download/v2.1.1/Postgres-2.1.1.dmg url: https://github.com/PostgresApp/PostgresApp/releases/download/v2.1.1/Postgres-2.1.1.dmg
sum: sha256=ac0656b522a58fd337931313f09509c09610c4a6078fe0b8e469e69af1e1750b sum: sha256=ac0656b522a58fd337931313f09509c09610c4a6078fe0b8e469e69af1e1750b
homebrew: homebrew:
url: url: ''
sum: sum: ''
dl: dl:
opts: -s -L opts: -s -L
interval: 60 interval: 60
@ -57,7 +57,7 @@ postgres:
bake_image: False bake_image: False
fromrepo: fromrepo: ''
users: {} users: {}
tablespaces: {} tablespaces: {}
@ -67,4 +67,4 @@ postgres:
linux: linux:
#Alternatives system are disabled by a 'altpriority=0' pillar. #Alternatives system are disabled by a 'altpriority=0' pillar.
altpriority: altpriority: 0