From dc324766938b55c8bce5a4dd585918f5a0a8f4f7 Mon Sep 17 00:00:00 2001 From: Jean-Gerard Pailloncy Date: Wed, 25 Sep 2024 11:28:40 +0200 Subject: [PATCH] ignore psqlrc --- tasks/check_pg_version_mismatch.yml | 4 ++-- tasks/databases.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/check_pg_version_mismatch.yml b/tasks/check_pg_version_mismatch.yml index 6d25709f..5fd548f0 100644 --- a/tasks/check_pg_version_mismatch.yml +++ b/tasks/check_pg_version_mismatch.yml @@ -3,7 +3,7 @@ # Check binary version - name: PostgreSQL | Check binary version shell: > - psql --version | sed 's/^psql (//' | sed 's/)//' | awk '{print $1, $2}' + psql -X --version | sed 's/^psql (//' | sed 's/)//' | awk '{print $1, $2}' become: yes become_user: "{{ postgresql_service_user }}" changed_when: false @@ -14,7 +14,7 @@ # Check database version - name: PostgreSQL | Check database version shell: > - psql --quiet --tuples-only --port={{ postgresql_port | int }} --command="select substring(version(),'[^\s]+\s+[^\s]+');" | sed 's/^ //' + psql -X --quiet --tuples-only --port={{ postgresql_port | int }} --command="select substring(version(),'[^\s]+\s+[^\s]+');" | sed 's/^ //' become: yes become_user: "{{ postgresql_service_user }}" changed_when: false diff --git a/tasks/databases.yml b/tasks/databases.yml index 97cfb3ad..444005f6 100644 --- a/tasks/databases.yml +++ b/tasks/databases.yml @@ -37,7 +37,7 @@ - name: PostgreSQL | Add hstore to the databases with the requirement become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS hstore;'" + shell: "{{ postgresql_bin_directory}}/psql -X {{item.name}} --port={{ postgresql_port | int }} --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) @@ -47,7 +47,7 @@ - name: PostgreSQL | Add uuid-ossp to the database with the requirement become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";'" + shell: "{{ postgresql_bin_directory}}/psql -X {{item.name}} --port={{ postgresql_port | int }} --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) @@ -57,35 +57,35 @@ - name: PostgreSQL | Add postgis to the databases with the requirement become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --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 -X {{item.name}} --port={{ postgresql_port | int }} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'&&psql -X {{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 become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --username {{ postgresql_admin_user }} -c 'create extension if not exists cube;'" + shell: "{{ postgresql_bin_directory}}/psql -X {{item.name}} --port={{ postgresql_port | int }} --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 become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --username {{ postgresql_admin_user }} -c 'CREATE EXTENSION IF NOT EXISTS plpgsql;'" + shell: "{{ postgresql_bin_directory}}/psql -X {{item.name}} --port={{ postgresql_port | int }} --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 become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --username {{ postgresql_admin_user }} -c 'create extension if not exists earthdistance;'" + shell: "{{ postgresql_bin_directory}}/psql -X {{item.name}} --port={{ postgresql_port | int }} --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 become: yes become_user: "{{postgresql_service_user}}" - shell: "{{ postgresql_bin_directory}}/psql {{item.name}} --port={{ postgresql_port | int }} --username {{postgresql_admin_user}} -c 'CREATE EXTENSION IF NOT EXISTS citext;'" + shell: "{{ postgresql_bin_directory}}/psql -X {{item.name}} --port={{ postgresql_port | int }} --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)