fix(contributing): postgresql-repo state ID requires python3-apt package

This commit is contained in:
LitniAlex
2020-07-04 17:46:33 +03:00
parent 68a791ef09
commit 69b57e3b69
6 changed files with 9 additions and 14 deletions

View File

@@ -9,6 +9,7 @@ postgres:
version: '10' version: '10'
pkg: postgresql pkg: postgresql
pkgs_extra: [] pkgs_extra: []
pkgs_deps: []
pkg_client: postgresql-client pkg_client: postgresql-client
pkg_dev: postgresql-devel pkg_dev: postgresql-devel
pkg_dev_deps: [] pkg_dev_deps: []
@@ -76,7 +77,7 @@ postgres:
sysrc: false sysrc: false
bake_image: false bake_image: false
bake_image_run_cmd: echo "do nothing by default" bake_image_run_cmd: pg_ctl start
fromrepo: '' fromrepo: ''

View File

@@ -4,6 +4,7 @@ include:
- postgres.macos - postgres.macos
{% else %} {% else %}
- postgres.server - postgres.server
- postgres.server.image
- postgres.client - postgres.client
- postgres.manage - postgres.manage
{% endif %} {% endif %}

View File

@@ -12,6 +12,7 @@ Arch:
pkg_dev: postgresql pkg_dev: postgresql
Debian: Debian:
pkgs_deps: ['python3-apt']
pkg_repo: pkg_repo:
humanname: PostgreSQL Official Repository humanname: PostgreSQL Official Repository
key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'

View File

@@ -5,11 +5,7 @@
{%- if postgres.bake_image %} {%- if postgres.bake_image %}
include:
- postgres.server
# An attempt to start PostgreSQL with `pg_ctl` # An attempt to start PostgreSQL with `pg_ctl`
postgresql-running: postgresql-running:
cmd.run: cmd.run:
- name: {{ postgres.bake_image_run_cmd }} - name: {{ postgres.bake_image_run_cmd }}
@@ -40,10 +36,4 @@ postgresql-enable:
- require: - require:
- cmd: postgresql-running - cmd: postgresql-running
{%- else %}
postgresql-running:
test.show_notification:
- text: The 'postgres:bake_image' Pillar is disabled (set to 'False').
{%- endif %} {%- endif %}

View File

@@ -1,9 +1,6 @@
{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%} {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
{%- set includes = [] %} {%- set includes = [] %}
{%- if postgres.bake_image %}
{%- do includes.append('postgres.server.image') %}
{%- endif %}
{%- if postgres.use_upstream_repo == true -%} {%- if postgres.use_upstream_repo == true -%}
{%- do includes.append('postgres.upstream') %} {%- do includes.append('postgres.upstream') %}
{%- endif %} {%- endif %}

View File

@@ -17,6 +17,11 @@ postgresql-profile:
- defaults: - defaults:
bin_dir: {{ postgres.bin_dir }} bin_dir: {{ postgres.bin_dir }}
{%- endif %} {%- endif %}
postgresql-pkg-deps:
pkg.installed:
- pkgs: {{ postgres.pkgs_deps }}
# Add upstream repository for your distro # Add upstream repository for your distro
postgresql-repo: postgresql-repo:
pkgrepo.managed: pkgrepo.managed: