karel/postgres-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #309 from netmanagers/master

Browse Source
This commit is contained in:
sticky-note
2021-02-26 23:46:28 +11:00
committed by GitHub
parent 7d46b273af 26b223323f
commit ec5d66f94e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/client/init.sls
View File

@@ -16,7 +16,7 @@ include:
postgresql-client-libs: postgresql-client-libs:
pkg.installed: pkg.installed:
- pkgs: {{ pkgs | json }} - pkgs: {{ pkgs | json }}
{%- if postgres.use_upstream_repo == true %} {%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
- refresh: True - refresh: True
- require: - require:
- pkgrepo: postgresql-repo - pkgrepo: postgresql-repo

2
postgres/python.sls
View File

@@ -9,7 +9,7 @@ postgresql-python:
{% if postgres.fromrepo %} {% if postgres.fromrepo %}
- fromrepo: {{ postgres.fromrepo }} - fromrepo: {{ postgres.fromrepo }}
{% endif %} {% endif %}
{% if postgres.use_upstream_repo == true %} {% if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
- refresh: True - refresh: True
- require: - require:
- pkgrepo: postgresql-repo - pkgrepo: postgresql-repo

4
postgres/server/init.sls
View File

@@ -18,8 +18,10 @@ include:
postgresql-server: postgresql-server:
pkg.installed: pkg.installed:
- pkgs: {{ pkgs | json }} - pkgs: {{ pkgs | json }}
{%- if postgres.use_upstream_repo == true %} {%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
- refresh: True - refresh: True
- require:
- pkgrepo: postgresql-repo
{%- endif %} {%- endif %}
{%- if postgres.fromrepo %} {%- if postgres.fromrepo %}
- fromrepo: {{ postgres.fromrepo }} - fromrepo: {{ postgres.fromrepo }}

2
postgres/upstream.sls
View File

@@ -28,8 +28,6 @@ postgresql-repo:
{{- format_kwargs(postgres.pkg_repo) }} {{- format_kwargs(postgres.pkg_repo) }}
- require: - require:
- pkg: postgresql-pkg-deps - pkg: postgresql-pkg-deps
- require_in:
- pkg: postgresql-server
{%- else -%} {%- else -%}