diff --git a/defaults/main.yml b/defaults/main.yml index d553cd0b..ae36701b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,10 +31,10 @@ postgresql_ext_install_postgis: no postgresql_ext_postgis_version: "2.1" # be careful: check whether the postgresql/postgis versions work together -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}}" +# - "postgresql-{{postgresql_version}}-postgis-scripts" # List of databases to be created (optional) postgresql_databases: [] @@ -741,3 +741,4 @@ postgresql_pgdg_releases: postgresql_version_terse: "{{ postgresql_version | replace('.', '') }}" postgresql_yum_repository_base_url: "http://yum.postgresql.org" postgresql_yum_repository_url: "{{ postgresql_yum_repository_base_url }}/{{ postgresql_version }}/{{ ansible_os_family | lower }}/rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}/pgdg-{{ postgresql_pgdg_dists[ansible_distribution] }}{{ postgresql_version_terse }}-{{ postgresql_version }}-{{ postgresql_pgdg_releases.get(postgresql_pgdg_dists[ansible_distribution]).get(postgresql_version) }}.noarch.rpm" +postgresql_ext_postgis_version_terse: "{{ postgresql_ext_postgis_version | replace('.', '') }}" diff --git a/tasks/configure.yml b/tasks/configure.yml index aa4e4160..f1d408a3 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -70,7 +70,7 @@ path: "{{ postgresql_conf_directory }}" owner: "{{ postgresql_service_user }}" group: "{{ postgresql_service_group }}" - mode: 0750 + mode: 0700 state: directory - name: PostgreSQL | Update configuration - pt. 1 (pg_hba.conf) diff --git a/tasks/extensions/postgis.yml b/tasks/extensions/postgis.yml index c8704d6f..fa671a51 100644 --- a/tasks/extensions/postgis.yml +++ b/tasks/extensions/postgis.yml @@ -1,16 +1,41 @@ # file: postgresql/tasks/extensions/postgis.yml +# - include_vars: "{{ item }}" +# with_first_found: +# - "../vars/{{ ansible_distribution_release }}.yml" +# - "../vars/empty.yml" + - include_vars: "{{ item }}" with_first_found: - - "../vars/{{ ansible_distribution_release }}.yml" + - "../vars/{{ ansible_os_family }}.yml" - "../vars/empty.yml" + tags: [always] -- name: PostgreSQL | Extensions | Make sure the postgis extensions are installed +- name: PostgreSQL | Extensions | Make sure the postgis extensions are installed | Debian apt: 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" + # with_items: "{{ postgresql_ext_postgis_deps }}" # used to be in 'defaults/main.yml' + with_items: + - libgeos-c1 + - "postgresql-{{postgresql_version}}-postgis-{{postgresql_ext_postgis_version}}" + - "postgresql-{{postgresql_version}}-postgis-scripts" + notify: + - restart postgresql + +- name: PostgreSQL | Extensions | Make sure the postgis extensions are installed | RedHat + yum: + name: "{{ item }}" + state: present + update_cache: yes + when: ansible_os_family == "RedHat" + environment: "{{ postgresql_env }}" + with_items: + - "postgis{{ postgresql_ext_postgis_version_terse }}_{{postgresql_version_terse}}" + - "postgis{{ postgresql_ext_postgis_version_terse }}_{{postgresql_version_terse}}-client" + - "postgis{{ postgresql_ext_postgis_version_terse }}_{{postgresql_version_terse}}-utils" notify: - restart postgresql