Merge branch 'master' into fix_postgis_on_centos

ANXS · Apr 25, 2018 · a683ea5 · a683ea5
2 parents 34865ff + 2ba99be
commit a683ea5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -41,6 +41,11 @@ postgresql_postgis_release_compatibility:
 postgresql_ext_postgis_version: "{{ postgresql_postgis_release_compatibility.get(postgresql_version) }}"
 postgresql_ext_postgis_version_terse: "{{ postgresql_ext_postgis_version | replace('.','') }}"
 
+postgresql_ext_postgis_deps:
+  - libgeos-c1
+  - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"
+  - "postgresql-{{ postgresql_version }}-postgis-scripts"
+
 postgresql_ext_postgis_deps:
   - libgeos-c1
   - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"

diff --git a/tasks/extensions/contrib.yml b/tasks/extensions/contrib.yml
@@ -12,17 +12,9 @@
 
 - name: PostgreSQL | Extensions | Make sure the postgres contrib extensions are installed | RedHat
   yum:
-<<<<<<< HEAD
-=======
-    - restart postgresql with systemd
->>>>>>> 0e57ece639d2a2bad33cea5e35919c9d72e84d23
     name: "postgresql{{postgresql_version_terse}}-contrib"
     state: present
   when: ansible_os_family == "RedHat"
   notify:
-<<<<<<< HEAD
     - restart postgresql with service
     - restart postgresql with systemd
-=======
-    - restart postgresql
->>>>>>> 0e57ece639d2a2bad33cea5e35919c9d72e84d23
diff --git a/tasks/extensions/postgis.yml b/tasks/extensions/postgis.yml
@@ -11,6 +11,17 @@
   notify:
     - restart postgresql with service
 
+- name: PostgreSQL | Extensions | Make sure the postgis extensions are installed | RedHat
+  yum:
+    name: "{{item}}"
+    state: present
+    update_cache: yes
+    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}}"