Fixed more merging problems

Author: Greg Clough

handlers/main.yml

@@ -12,3 +12,4 @@
       state: restarted
       enabled: yes
     when: ansible_service_mgr == 'systemd'
+ 

tasks/extensions/contrib.yml

@@ -2,17 +2,17 @@
 
 - name: PostgreSQL | Extensions | Make sure the postgres contrib extensions are installed | Debian
   apt:
-    name: "postgresql-contrib-{{ postgresql_version }}"
+    name: "postgresql-contrib-{{postgresql_version}}"
     state: present
     update_cache: yes
-    cache_valid_time: "{{ apt_cache_valid_time | default (3600) }}"
+    cache_valid_time: "{{apt_cache_valid_time | default (3600)}}"
   when: ansible_os_family == "Debian"
   notify:
     - restart postgresql
 
 - name: PostgreSQL | Extensions | Make sure the postgres contrib extensions are installed | RedHat
   yum:
-    name: "postgresql{{ postgresql_version_terse }}-contrib"
+    name: "postgresql{{postgresql_version_terse}}-contrib"
     state: present
   when: ansible_pkg_mgr == "yum" and ansible_distribution == "RedHat"
   notify:
@@ -25,3 +25,4 @@
   when: ansible_pkg_mgr == "dnf" and ansible_distribution == "Fedora"
   notify:
     - restart postgresql
+

tasks/extensions/dev_headers.yml

@@ -5,10 +5,10 @@
     name: libpq-dev
     state: present
     update_cache: yes
-    cache_valid_time: "{{ apt_cache_valid_time | default (3600) }}"
+    cache_valid_time: "{{apt_cache_valid_time | default (3600)}}"
   when: ansible_os_family == "Debian"
   notify:
-    - restart postgresql with service
+    - restart postgresql
 
 - name: PostgreSQL | Extensions | Make sure the development headers are installed | RedHat
   yum: 

tasks/extensions/postgis.yml

@@ -1,19 +1,24 @@
 # file: postgresql/tasks/extensions/postgis.yml
 
+- include_vars: "{{ item }}"
+  with_first_found:
+    - "../vars/{{ ansible_distribution_release }}.yml"
+    - "../vars/empty.yml"
+
 - name: PostgreSQL | Extensions | Make sure the postgis extensions are installed | Debian
   apt:
-    name: "{{ item }}"
+    name: "{{item}}"
     state: present
     update_cache: yes
-    cache_valid_time: "{{ apt_cache_valid_time | default (3600) }}"
+    cache_valid_time: "{{apt_cache_valid_time | default (3600)}}"
   with_items: "{{ postgresql_ext_postgis_deps }}"
   when: ansible_os_family == "Debian"
   notify:
     - restart postgresql
 
 - name: PostgreSQL | Extensions | Make sure the postgis extensions are installed | RedHat
   yum:
-    name: "{{ item }}"
+    name: "{{item}}"
     state: present
     update_cache: yes
   with_items: "{{ postgresql_ext_postgis_deps }}"
@@ -28,3 +33,4 @@
   when: ansible_pkg_mgr == "dnf" and ansible_distribution == "Fedora"
   notify:
     - restart postgresql
+