Install postgresql 9.4, 9.3 or 9.1 if available

(on Debian Jessie, Ubuntu Trusty or older distributions such as
Debian Wheezy and Ubuntu Precise).

roles/mailserver/tasks/dovecot.yml

@@ -24,18 +24,18 @@
     - dovecot-pop3d
   when: ansible_distribution_release != 'wheezy'
 
-- name: Install Dovecot Postgres dependency for distributions other than Ubuntu Trusty
-  apt: pkg={{ item }} state=installed
-  with_items:
-    - postgresql-9.1
-  when: ansible_distribution_release != 'trusty'
+- name: Install Postgres 9.1 for Dovecot on older distributions
+  apt: pkg=postgresql-9.1 state=present
+  when: ansible_distribution_release != 'trusty' and ansible_distribution_release != 'jessie'
 
-- name: Install Dovecot Postgres dependency for Ubuntu trusty
-  apt: pkg={{ item }} state=installed
-  with_items:
-    - postgresql-9.3
+- name: Install Postgres 9.3 for Dovecot on Ubuntu Trusty
+  apt: pkg=postgresql-9.3 state=present
   when: ansible_distribution_release == 'trusty'
 
+- name: Install Postgres 9.4 for Dovecot on Debian Jessie
+  apt: pkg=postgresql-9.4 state=present
+  when: ansible_distribution_release == 'jessie'
+
 - name: Create vmail group
   group: name=vmail state=present gid=5000
 

roles/mailserver/tasks/postfix.yml

@@ -1,28 +1,25 @@
-- name: Install Postfix 9.1 and related packages for distributions other than Ubuntu Trusty
-  apt: pkg={{ item }} state=installed
-  with_items:
-    - libsasl2-modules
-    - postfix
-    - postfix-pcre
-    - postfix-pgsql
-    - postgresql-9.1
-    - postgrey
-    - python-psycopg2
-    - sasl2-bin
-  when: ansible_distribution_release != 'trusty'
+- name: Install Postgres 9.1 on older distributions
+  apt: pkg=postgresql-9.1 state=present
+  when: ansible_distribution_release != 'trusty' and ansible_distribution_release != 'jessie'
+
+- name: Install Postgres 9.3 on Ubuntu Trusty
+  apt: pkg=postgresql-9.3 state=present
+  when: ansible_distribution_release == 'trusty'
+
+- name: Install Postgres 9.4 on Debian Jessie
+  apt: pkg=postgresql-9.4 state=present
+  when: ansible_distribution_release == 'jessie'
 
-- name: Install Postfix 9.3 and related packages for Ubuntu Trusty
+- name: Install Postfix and related packages
   apt: pkg={{ item }} state=installed
   with_items:
     - libsasl2-modules
     - postfix
     - postfix-pcre
     - postfix-pgsql
-    - postgresql-9.3
     - postgrey
     - python-psycopg2
     - sasl2-bin
-  when: ansible_distribution_release == 'trusty'
 
 - name: Set postgres password
   command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"