Merge branch 'master' into fix_postgis_on_centos

ANXS · Apr 3, 2018 · 9f90ddb · 9f90ddb
2 parents ff681e4 + e5df722
commit 9f90ddb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -56,6 +56,11 @@ postgresql_ext_postgis_deps:
   - "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 }}"
+  - "postgresql-{{ postgresql_version }}-postgis-scripts"
+
 # List of databases to be created (optional)
 postgresql_databases: []
 
@@ -788,4 +793,4 @@ postgresql_yum_repository_url: "{{ postgresql_yum_repository_base_url }}/{{ post
 
 postgresql_apt_py3_dependencies: ["python3-psycopg2", "locales"]
 postgresql_apt_py2_dependencies: ["python-psycopg2", "python-pycurl", "locales"]
-postgresql_apt_dependencies: "{{ postgresql_apt_py3_dependencies if 'python3' in ansible_python_interpreter|default('') else postgresql_apt_py2_dependencies }}"
+postgresql_apt_dependencies: "{{ postgresql_apt_py3_dependencies if 'python3' in ansible_python_interpreter|default('') else postgresql_apt_py2_dependencies }}"
diff --git a/tasks/extensions/postgis.yml b/tasks/extensions/postgis.yml
@@ -19,4 +19,4 @@
   with_items: "{{ postgresql_ext_postgis_deps }}"
   when: ansible_os_family == "RedHat"
   notify:
-    - restart postgresql
+    - restart postgresql
diff --git a/tests/docker/group_vars/postgresql.yml b/tests/docker/group_vars/postgresql.yml
@@ -35,4 +35,4 @@ postgresql_database_extensions:
     - adminpack
     - pgcrypto
     - unaccent
-    - postgis
+    - postgis
diff --git a/tests/vars.yml b/tests/vars.yml
@@ -21,4 +21,4 @@ postgresql_users:
 
 postgresql_user_privileges:
   - name: baz
-    db: foobar
+    db: foobar
diff --git a/vars/xenial.yml b/vars/xenial.yml
@@ -3,4 +3,4 @@
 postgresql_ext_postgis_deps:
   - libgeos-c1v5
   - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"
-  - "postgresql-{{ postgresql_version }}-postgis-scripts"
+  - "postgresql-{{ postgresql_version }}-postgis-scripts"