updated postgresql state

states/ipbl/install.sls

@@ -1,9 +1,5 @@
 ---
 {%- from "ipbl/map.jinja" import ipbl with context %}
-ipbl-dependencies:
-  pkg.installed:
-    - name: libczmq4
-
 ipbl-archive-extract:
   archive.extracted:
     - name: {{ ipbl.release_dir }}/ipbl-{{ ipbl.version }}

states/postgresql/config.sls

@@ -2,7 +2,7 @@
 {%- from "postgresql/map.jinja" import postgresql with context %}
 postgresql-config-main:
   file.keyvalue:
-    - name: {{ postgresql.configpath }}/postgresql.conf
+    - name: /etc/postgresql/{{ postgresql.version }}/main/postgresql.conf
     - key_values: {{ postgresql.config.main }}
     - separator: ' = '
     - uncomment: '# '
@@ -13,7 +13,7 @@ postgresql-config-main:
 
 postgresql-config-hba:
   file.managed:
-    - name: {{ postgresql.configpath }}/pg_hba.conf
+    - name: /etc/postgresql/{{ postgresql.version }}/main/pg_hba.conf
     - source: salt://postgresql/templates/pg_hba.conf.j2
     - template: jinja
     - watch_in:

states/postgresql/defaults.yaml

@@ -1,15 +1,14 @@
 ---
 postgresql:
+  version: 13
   packages:
-    - postgresql-13
+    - repmgr
-    - postgresql-13-cron
+  extensions:
-    - postgresql-13-repmgr
+    - cron
-    - postgresql-client-13
     - repmgr
   databases:
     - name: postgres
       user: postgres
-  configpath: /etc/postgresql/13/main
   config:
     main:
       listen_addresses: "'*'"

states/postgresql/install.sls

@@ -1,8 +1,18 @@
 ---
 {%- from "postgresql/map.jinja" import postgresql with context %}
-postgresql-install:
+postgresql-install-base:
   pkg.installed:
     - pkgs:
-{%- for pkg in postgresql.packages %}
+      - postgresql-{{ postgresql.version }}
-      - {{ pkg }}
+      - postgresql-client-{{ postgresql.version }}
+
+postgresql-install-extensions:
+  pkg.installed:
+    - pkgs:
+{%- for extension in postgresql.extensions %}
+      - postgresql-{{ postgresql.version }}-{{ extension }}
 {%- endfor %}
+
+postgresql-install-misc:
+  pkg.installed:
+    - pkgs: {{ postgresql.packages }}

states/postgresql/service.sls

@@ -1,5 +1,6 @@
 ---
+{%- from "postgresql/map.jinja" import postgresql with context %}
 postgresql-service:
   service.running:
-    - name: postgresql@13-main
+    - name: postgresql@{{ postgresql.version }}-main
     - enable: true