taperole 1.3.6 → 1.4.0

data/vendor/ANXS.postgresql/tasks/configure.yml

@@ -1,5 +1,12 @@
 # file: postgresql/tasks/configure.yml
 
+- name: PostgreSQL | Drop the data directory | RedHat
+  file:
+    path: "{{ postgresql_data_directory }}"
+    state: absent
+  register: pgdata_dir_remove
+  when: ansible_os_family == "RedHat" and postgresql_cluster_reset
+
 - name: PostgreSQL | Make sure the postgres data directory exists
   file:
     path: "{{postgresql_data_directory}}"
@@ -9,21 +16,58 @@
     mode: 0700
   register: pgdata_dir_exist
 
-- name: PostgreSQL | Ensure the locale is generated
+- name: PostgreSQL | Ensure the locale is generated | Debian
+  sudo: yes
+  locale_gen: name="{{ postgresql_locale }}" state=present
+  when: ansible_os_family == "Debian"
+
+- name: PostgreSQL | Ensure the locale is generated | RedHat
+  sudo: yes
+  command: >
+    localedef -c -i {{ postgresql_locale_parts[0] }} -f {{ postgresql_locale_parts[1] }}
+    {{ postgresql_locale }}
+  changed_when: false
+  when: ansible_os_family == "RedHat"
+
+- name: PostgreSQL | Reset the cluster - drop the existing one | Debian
+  shell: pg_dropcluster --stop {{ postgresql_version }} {{ postgresql_cluster_name }}
   sudo: yes
-  locale_gen: name={{postgresql_locale}} state=present
+  sudo_user: "{{ postgresql_service_user }}"
+  when: ansible_os_family == "Debian" and postgresql_cluster_reset and pgdata_dir_exist.changed
 
-- name: PostgreSQL | Reset the cluster - drop the existing one
-  shell: pg_dropcluster --stop {{postgresql_version}} {{postgresql_cluster_name}}
+- name: PostgreSQL | Reset the cluster - create a new one (with specified encoding and locale) | Debian
+  shell: >
+    pg_createcluster --start --locale {{ postgresql_locale }}
+    -e {{ postgresql_encoding }} -d {{ postgresql_data_directory }}
+    {{ postgresql_version }} {{ postgresql_cluster_name }}
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  when: postgresql_cluster_reset and pgdata_dir_exist.changed
+  when: ansible_os_family == "Debian" and postgresql_cluster_reset and pgdata_dir_exist.changed
+
+- name: PostgreSQL | Check whether the postgres data directory is initialized
+  stat:
+    path: "{{ postgresql_data_directory }}/PG_VERSION"
+  when: ansible_os_family == "RedHat" and not postgresql_cluster_reset
+  register: pgdata_dir_initialized
 
-- name: PostgreSQL | Reset the cluster - create a new one (with specified encoding and locale)
-  shell: pg_createcluster --start --locale {{postgresql_locale}} -e {{postgresql_encoding}} -d {{postgresql_data_directory}} {{postgresql_version}} {{postgresql_cluster_name}}
+- name: PostgreSQL | Initialize the database | RedHat
+  command: >
+    {{ postgresql_bin_directory }}/initdb -D {{ postgresql_data_directory }}
+    --locale={{ postgresql_locale }} --encoding={{ postgresql_encoding }}
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  when: postgresql_cluster_reset and pgdata_dir_exist.changed
+  when: ansible_os_family == "RedHat" and
+        (postgresql_cluster_reset or
+         pgdata_dir_exist.changed or
+         not pgdata_dir_initialized.stat.exists)
+
+- name: PostgreSQL | Ensure configuration directory exists
+  file:
+    path: "{{ postgresql_conf_directory }}"
+    owner: "{{ postgresql_service_user }}"
+    group: "{{ postgresql_service_group }}"
+    mode: 0750
+    state: directory
 
 - name: PostgreSQL | Update configuration - pt. 1 (pg_hba.conf)
   template:
@@ -82,8 +126,30 @@
     group: "{{ postgresql_service_group }}"
     mode: 0755
 
+- name: PostgreSQL | Ensure the systemd directory for PostgreSQL exists | RedHat
+  file:
+    name: "/etc/systemd/system/postgresql-{{ postgresql_version }}.service.d"
+    state: directory
+    mode: 0755
+  when: ansible_os_family == "RedHat"
+
+- name: PostgreSQL | Use the conf directory when starting the Postgres service | RedHat
+  template:
+    src: etc_systemd_system_postgresql.service.d_custom.conf.j2
+    dest: "/etc/systemd/system/postgresql-{{ postgresql_version }}.service.d/custom.conf"
+  when: ansible_os_family == "RedHat"
+  register: postgresql_systemd_custom_conf
+
+- name: PostgreSQL | Ensure the pid directory for PostgreSQL exists
+  file:
+    name: "{{ postgresql_pid_directory }}"
+    state: directory
+    owner: "{{ postgresql_service_user }}"
+    group: "{{ postgresql_service_group }}"
+    mode: u=rwX,g=rwXs,o=rx
+
 - name: PostgreSQL | Restart PostgreSQL
   service:
-    name: postgresql
+    name: "{{ postgresql_service_name }}"
     state: restarted
-  when: postgresql_configuration_pt1.changed or postgresql_configuration_pt2.changed or postgresql_configuration_pt3.changed
+  when: postgresql_configuration_pt1.changed or postgresql_configuration_pt2.changed or postgresql_configuration_pt3.changed or postgresql_systemd_custom_conf.changed

data/vendor/ANXS.postgresql/tasks/databases.yml

@@ -2,13 +2,13 @@
 
 - name: PostgreSQL | Ensure PostgreSQL is running
   service:
-    name: postgresql
+    name: "{{ postgresql_service_name }}"
     state: started
 
 - name: PostgreSQL | Make sure the PostgreSQL databases are present
   postgresql_db:
     name: "{{item.name}}"
-    owner: "{{postgresql_database_owner}}"
+    owner: "{{ item.owner | default(postgresql_database_owner) }}"
     encoding: "{{postgresql_encoding}}"
     lc_collate: "{{postgresql_locale}}"
     lc_ctype: "{{postgresql_locale}}"
@@ -21,10 +21,20 @@
   with_items: postgresql_databases
   when: postgresql_databases|length > 0
 
+- name: PostgreSQL | Add extensions to the databases
+  shell: "psql {{item.0.db}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS {{ item.1 }};'"
+  sudo: yes
+  sudo_user: "{{postgresql_admin_user}}"
+  with_subelements:
+    - postgresql_database_extensions
+    - extensions
+  register: result
+  changed_when: "'NOTICE' not in result.stderr"
+
 - name: PostgreSQL | Add hstore to the databases with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS hstore;'"
   with_items: postgresql_databases
   register: hstore_ext_result
   failed_when: hstore_ext_result.rc != 0 and ("already exists, skipping" not in hstore_ext_result.stderr)
@@ -34,7 +44,7 @@
 - name: PostgreSQL | Add uuid-ossp to the database with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";'"
   with_items: postgresql_databases
   register: uuid_ext_result
   failed_when: uuid_ext_result.rc != 0 and ("already exists, skipping" not in uuid_ext_result.stderr)
@@ -44,35 +54,35 @@
 - name: PostgreSQL | Add postgis to the databases with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'&&psql {{item.name}} -c 'CREATE EXTENSION IF NOT EXISTS postgis_topology;'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'&&psql {{item.name}} -c 'CREATE EXTENSION IF NOT EXISTS postgis_topology;'"
   with_items: postgresql_databases
   when: item.gis is defined and item.gis
 
-- name: postgresql | add cube to the database with the requirement
+- name: PostgreSQL | add cube to the database with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{ postgresql_admin_user }} -c 'create extension if not exists cube;'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{ postgresql_admin_user }} -c 'create extension if not exists cube;'"
   with_items: postgresql_databases
   when: item.cube is defined and item.cube
 
 - name: PostgreSQL | Add plpgsql to the database with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{ postgresql_admin_user }} -c 'CREATE EXTENSION IF NOT EXISTS plpgsql;'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{ postgresql_admin_user }} -c 'CREATE EXTENSION IF NOT EXISTS plpgsql;'"
   with_items: postgresql_databases
   when: item.plpgsql is defined and item.plpgsql
 
-- name: postgresql | add earthdistance to the database with the requirement
+- name: PostgreSQL | add earthdistance to the database with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{ postgresql_admin_user }} -c 'create extension if not exists earthdistance;'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{ postgresql_admin_user }} -c 'create extension if not exists earthdistance;'"
   with_items: postgresql_databases
   when: item.earthdistance is defined and item.earthdistance
 
 - name: PostgreSQL | Add citext to the database with the requirement
   sudo: yes
   sudo_user: "{{ postgresql_service_user }}"
-  shell: "psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS citext;'"
+  shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS citext;'"
   with_items: postgresql_databases
   register: citext_ext_result
   failed_when: citext_ext_result.rc != 0 and ("already exists, skipping" not in citext_ext_result.stderr)

data/vendor/ANXS.postgresql/tasks/extensions/contrib.yml

@@ -1,11 +1,19 @@
 # file: postgresql/tasks/extensions/contrib.yml
 
-- name: PostgreSQL | Extensions | Make sure the postgres contrib extensions are installed
+- name: PostgreSQL | Extensions | Make sure the postgres contrib extensions are installed | Debian
   apt:
     name: "postgresql-contrib-{{postgresql_version}}"
     state: present
     update_cache: yes
     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"
+    state: present
+  when: ansible_os_family == "RedHat"
+  notify:
+    - restart postgresql

data/vendor/ANXS.postgresql/tasks/install.yml

@@ -40,7 +40,7 @@
     state: present
     update_cache: yes
     cache_valid_time: "{{apt_cache_valid_time | default (3600)}}"
-  environment: postgresql_env
+  environment: "{{postgresql_env}}"
   with_items:
     - "postgresql-{{postgresql_version}}"
     - "postgresql-client-{{postgresql_version}}"
@@ -52,5 +52,5 @@
     state: present
     update_cache: yes
     cache_valid_time: "{{apt_cache_valid_time | default (3600)}}"
-  environment: postgresql_env
+  environment: "{{postgresql_env}}"
   when: postgresql_pgtune

data/vendor/ANXS.postgresql/tasks/install_yum.yml

@@ -0,0 +1,36 @@
+# file: postgresql/tasks/install_yum.yml
+
+# The standard ca-certs are needed because  without them apt_key will fail to
+# validate www.postgresql.org (or probably any other source).
+- name: PostgreSQL | Make sure the CA certificates are available
+  yum:
+    name: ca-certificates
+    state: present
+
+- name: PostgreSQL | Add PostgreSQL repository
+  yum:
+    name: "{{ postgresql_yum_repository_url }}"
+    state: present
+
+- name: PostgreSQL | Make sure the dependencies are installed
+  yum:
+    name: "{{ item }}"
+    state: present
+    update_cache: yes
+  with_items: ["python-psycopg2", "python-pycurl", "glibc-common"]
+
+- name: PostgreSQL | Install PostgreSQL
+  yum:
+    name: "{{ item }}"
+    state: present
+  environment: postgresql_env
+  with_items:
+    - "postgresql{{ postgresql_version_terse }}-server"
+    - "postgresql{{ postgresql_version_terse }}"
+
+- name: PostgreSQL | PGTune
+  yum:
+    name: pgtune
+    state: present
+  environment: postgresql_env
+  when: postgresql_pgtune

data/vendor/ANXS.postgresql/tasks/main.yml

@@ -1,6 +1,17 @@
 # file: postgresql/tasks/main.yml
 
+- include_vars: "{{ item }}"
+  with_first_found:
+    - "../vars/{{ ansible_os_family }}.yml"
+    - "../vars/empty.yml"
+  tags: [always]
+
 - include: install.yml
+  when: ansible_pkg_mgr == "apt"
+  tags: [postgresql, postgresql-install]
+
+- include: install_yum.yml
+  when: ansible_pkg_mgr == "yum"
   tags: [postgresql, postgresql-install]
 
 - include: extensions.yml

data/vendor/ANXS.postgresql/tasks/users.yml

@@ -2,13 +2,14 @@
 
 - name: PostgreSQL | Ensure PostgreSQL is running
   service:
-    name: postgresql
+    name: "{{ postgresql_service_name }}"
     state: started
 
 - name: PostgreSQL | Make sure the PostgreSQL users are present
   postgresql_user:
     name: "{{item.name}}"
     password: "{{item.pass | default('pass')}}"
+    encrypted: "{{ item.encrypted | default(omit) }}"
     port: "{{postgresql_port}}"
     state: present
     login_user: "{{postgresql_admin_user}}"

data/vendor/ANXS.postgresql/templates/HOWTO.postgresql.conf

@@ -0,0 +1,21 @@
+How to add a new PostgreSQL version
+===================================
+
+1) Download the Debian package 'postgresql-9.X_[...].deb' from
+http://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-9.X/
+
+2) Extract the 'usr/share/postgresql/9.1/postgresql.conf.sample' file
+and save it under the 'templates' role directory
+    => templates/postgresql.conf.9.{X}.orig
+
+3) Check the difference between another version:
+    => vimdiff postgresql.conf.9.{X-1}.orig postgresql.conf.9.{X}.orig
+
+4) Copy an existing template:
+    => cp postgresql.conf.9.{X-1}.j2 postgresql.conf.9.{X}.j2
+
+5) Update the new template following the major differences.
+
+5) If there are new options or some of them removed, update the 'default/main.yml' file and add a "(>= 9.X)" or "(<= 9.X)" comment to them.
+
+6) Update the '.travis.yml' file to test its new version.

data/vendor/ANXS.postgresql/templates/etc_systemd_system_postgresql.service.d_custom.conf.j2

@@ -0,0 +1,11 @@
+# {{ ansible_managed }}
+# Systemd unit file override to specify user/group as well as separate config
+# and data directories.
+[Service]
+User={{ postgresql_service_user }}
+Group={{ postgresql_service_group }}
+
+Environment=PGDATA={{ postgresql_conf_directory }}
+
+ExecStartPre=
+ExecStartPre={{ postgresql_bin_directory }}/postgresql{{ postgresql_version_terse }}-check-db-dir {{ postgresql_data_directory }}

data/vendor/ANXS.postgresql/templates/pg_hba.conf.j2

@@ -18,7 +18,9 @@
 
 # Default:
 {% for connection in postgresql_pg_hba_default %}
+{% if connection.comment is defined %}
 # {{connection.comment}}
+{% endif %}
 {{connection.type}}  {{connection.database}}  {{connection.user}}  {{connection.address}}  {{connection.method}}
 {% endfor %}
 
@@ -34,6 +36,8 @@ host  all  all  {{host}}  trust
 
 # User custom
 {% for connection in postgresql_pg_hba_custom %}
+{% if connection.comment is defined %}
 # {{connection.comment}}
+{% endif %}
 {{connection.type}}  {{connection.database}}  {{connection.user}}  {{connection.address}}  {{connection.method}}
 {% endfor %}