postgresql: Fix task order when using pgdg repo & Install the right pg version

CHANGELOG.md

@@ -29,6 +29,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 * Enforce String notation for mode
 * postgresql: fix nested loop for Munin plugins
+* postgresql: Fix task order when using pgdg repo
+* postgresql: Install the right pg version
 
 ### Removed
 

postgresql/tasks/packages_bullseye.yml

@@ -11,6 +11,6 @@
 - name: Install postgresql package
   apt:
     name:
-      - postgresql
+      - "postgresql-{{postgresql_version}}"
       - pgtop
       - libdbd-pg-perl

postgresql/tasks/packages_buster.yml

@@ -11,6 +11,6 @@
 - name: Install postgresql package
   apt:
     name:
-      - postgresql
+      - "postgresql-{{postgresql_version}}"
       - pgtop
       - libdbd-pg-perl

postgresql/tasks/packages_stretch.yml

@@ -11,6 +11,6 @@
 - name: Install postgresql package
   apt:
     name:
-      - postgresql
+      - "postgresql-{{postgresql_version}}"
       - ptop
       - libdbd-pg-perl

postgresql/tasks/pgdg-repo.yml

@@ -2,17 +2,12 @@
 - name: Open firewall for PGDG repository
   replace:
     name: /etc/default/minifirewall
-    regexp: "^(HTTPSITES='((?!apt\\.postgresql\\.org).)*)'$"
+    regexp: "^(HTTPSITES='((?!apt\\.postgresql\\.org|0\\.0\\.0\\.0).)*)'$"
     replace: "\\1 apt.postgresql.org'"
   notify: Restart minifirewall
 
 - meta: flush_handlers
 
-- name: Add PGDG repository
-  apt_repository:
-    repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main"
-    update_cache: yes
-
 - name: Look for legacy apt keyring
   stat:
     path: /etc/apt/trusted.gpg
@@ -34,9 +29,9 @@
     owner: root
     group: root
 
-- name: Update and upgrade apt packages for PGDG repository
+- name: Add PGDG repository
-  apt:
+  apt_repository:
-    upgrade: yes
+    repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main"
     update_cache: yes
 
 - name: Add APT preference file