From b2bc03ca493294426decf8923c4ce5d01e7b4728 Mon Sep 17 00:00:00 2001 From: Jean-Marie Mineau Date: Tue, 27 Jul 2021 04:28:48 +0200 Subject: [PATCH] include postgre setup to the synapse role --- roles/postgre/tasks/main.yml | 15 ++++++++------- roles/synapse/tasks/main.yml | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/roles/postgre/tasks/main.yml b/roles/postgre/tasks/main.yml index 5ed3711..51ff4aa 100644 --- a/roles/postgre/tasks/main.yml +++ b/roles/postgre/tasks/main.yml @@ -3,6 +3,7 @@ apt: update_cache: yes name: + - acl # Don't ask me, required by postgresql_user - postgresql - postgresql-contrib - libpq-dev @@ -45,21 +46,21 @@ become: true become_user: postgres postgresql_query: - query: "ALTER ROLE {{ item.name }} SET client_encoding TO 'utf8'" - loop: "{{ databases }}" + query: "ALTER ROLE {{ item }} SET client_encoding TO 'utf8'" + loop: "{{ postgres_users | map(attribute='name') }}" - name: Set encoding become: true become_user: postgres postgresql_query: - query: "ALTER ROLE {{ item.name }} SET default_transaction_isolation TO 'read committed'" - when: "{{ item.read_committed | default(false) }}" - loop: "{{ databases }}" + query: "ALTER ROLE {{ item }} SET default_transaction_isolation TO 'read committed'" + when: item.read_committed | default(false) + loop: "{{ postgres_users | map(attribute='name') }}" - name: Set timezone become: true become_user: postgres postgresql_query: - query: "ALTER ROLE {{ item.name }} SET timezone TO 'CET'" - loop: "{{ databases }}" + query: "ALTER ROLE {{ item }} SET timezone TO 'CET'" + loop: "{{ postgres_users | map(attribute='name') }}" diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml index 703fc96..2475848 100644 --- a/roles/synapse/tasks/main.yml +++ b/roles/synapse/tasks/main.yml @@ -1,4 +1,18 @@ --- + +- name: Setup postgres + include_role: + name: postgre + vars: + postgres_users: + - name: synapse_user + password: some password for now + databases: + - name: synapse + owner: synapse_user + local: C + template: template0 + - name: Install apt transport https apt: name: