saltstack-formulas/postgres-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/postgres-formula.git synced 2025-04-17 10:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved upstream repo to an include, checked for Ubuntu before attempting to add it

Browse source
This commit is contained in:
Dominic Ferrantelli 2015-04-21 15:13:42 -07:00
parent c62b41524d
commit 7ddfbb22e6
3 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
postgres/client.sls
View file

@ -1,15 +1,8 @@
{% from "postgres/map.jinja" import postgres with context %}
{% if salt['pillar.get']('postgres:use_upstream_repo') %}
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-client
include:
- postgres.upstream
{% endif %}
install-postgresql-client:

11
postgres/init.sls
View file

@ -1,15 +1,8 @@
{% from "postgres/map.jinja" import postgres with context %}
{% if salt['pillar.get']('postgres:use_upstream_repo') %}
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
include:
- postgres.upstream
{% endif %}
install-postgresql:

11
postgres/upstream.sls Normal file
View file

@ -0,0 +1,11 @@
{% from "postgres/map.jinja" import postgres with context %}
{% if grains['os'] == 'Ubuntu' %} # Other distro support should be added here
install-postgresql-repo:
pkgrepo.managed:
- humanname: PostgreSQL Official Repository
- name: {{ postgres.pkg_repo }}
- keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
- keyserver: keyserver.ubuntu.com
- file: {{ postgres.pkg_repo_file }}
{% endif %}