From 69b57e3b69062d0b66bd9fb28e3769a9ff579faa Mon Sep 17 00:00:00 2001
From: LitniAlex <litnialex@gmail.com>
Date: Sat, 4 Jul 2020 17:46:33 +0300
Subject: [PATCH] fix(contributing): postgresql-repo state ID requires
 python3-apt package

---
 postgres/defaults.yaml    |  3 ++-
 postgres/init.sls         |  1 +
 postgres/osfamilymap.yaml |  1 +
 postgres/server/image.sls | 10 ----------
 postgres/server/init.sls  |  3 ---
 postgres/upstream.sls     |  5 +++++
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index a44ca36..63af504 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -9,6 +9,7 @@ postgres:
   version: '10'
   pkg: postgresql
   pkgs_extra: []
+  pkgs_deps: []
   pkg_client: postgresql-client
   pkg_dev: postgresql-devel
   pkg_dev_deps: []
@@ -76,7 +77,7 @@ postgres:
     sysrc: false
 
   bake_image: false
-  bake_image_run_cmd: echo "do nothing by default"
+  bake_image_run_cmd: pg_ctl start
 
   fromrepo: ''
 
diff --git a/postgres/init.sls b/postgres/init.sls
index a28a0ed..4cebb32 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -4,6 +4,7 @@ include:
   - postgres.macos
 {% else %}
   - postgres.server
+  - postgres.server.image
   - postgres.client
   - postgres.manage
 {% endif %}
diff --git a/postgres/osfamilymap.yaml b/postgres/osfamilymap.yaml
index bde79cc..8933ce6 100644
--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -12,6 +12,7 @@ Arch:
   pkg_dev: postgresql
 
 Debian:
+  pkgs_deps: ['python3-apt']
   pkg_repo:
     humanname: PostgreSQL Official Repository
     key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
diff --git a/postgres/server/image.sls b/postgres/server/image.sls
index 75bd8d9..72c91b0 100644
--- a/postgres/server/image.sls
+++ b/postgres/server/image.sls
@@ -5,11 +5,7 @@
 
 {%- if postgres.bake_image %}
 
-include:
-  - postgres.server
-
 # An attempt to start PostgreSQL with `pg_ctl`
-
 postgresql-running:
   cmd.run:
     - name: {{ postgres.bake_image_run_cmd }}
@@ -40,10 +36,4 @@ postgresql-enable:
     - require:
       - cmd: postgresql-running
 
-{%- else %}
-
-postgresql-running:
-  test.show_notification:
-    - text: The 'postgres:bake_image' Pillar is disabled (set to 'False').
-
 {%- endif %}
diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index ce1d575..0a66e93 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -1,9 +1,6 @@
 {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 {%- set includes = [] %}
-{%- if postgres.bake_image %}
-  {%- do includes.append('postgres.server.image') %}
-{%- endif %}
 {%- if postgres.use_upstream_repo == true -%}
   {%- do includes.append('postgres.upstream') %}
 {%- endif %}
diff --git a/postgres/upstream.sls b/postgres/upstream.sls
index f38c96e..44e7f9d 100644
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -17,6 +17,11 @@ postgresql-profile:
     - defaults:
         bin_dir: {{ postgres.bin_dir }}
     {%- endif %}
+
+postgresql-pkg-deps:
+  pkg.installed:
+    - pkgs: {{ postgres.pkgs_deps }}
+
 # Add upstream repository for your distro
 postgresql-repo:
   pkgrepo.managed: