From 1bfb412cf8800df1e7533cc4958e327919d7679c Mon Sep 17 00:00:00 2001 From: uumas Date: Fri, 14 Jul 2023 13:59:00 +0300 Subject: [PATCH] simplify matrix_auto_join_users --- roles/synapse/defaults/main.yml | 2 ++ roles/synapse/tasks/config.yml | 11 +---------- roles/synapse/templates/conf.d/autojoin.yaml.j2 | 5 +---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/roles/synapse/defaults/main.yml b/roles/synapse/defaults/main.yml index c53289d..2e4105e 100644 --- a/roles/synapse/defaults/main.yml +++ b/roles/synapse/defaults/main.yml @@ -8,3 +8,5 @@ synapse_psql_db: "{{ synapse_psql_user }}" matrix_max_upload_size_mb: 100 synapse_metrics: false synapse_presence: true + +matrix_auto_join_rooms: [] diff --git a/roles/synapse/tasks/config.yml b/roles/synapse/tasks/config.yml index 68f991d..04746b8 100644 --- a/roles/synapse/tasks/config.yml +++ b/roles/synapse/tasks/config.yml @@ -29,6 +29,7 @@ - listeners - server_name - url_preview + - autojoin notify: Config matrix target - name: Ensure synapse configs including secrets is in place @@ -43,16 +44,6 @@ - general notify: Config matrix target -- name: Ensure autojoin config is in place - ansible.builtin.template: - src: conf.d/autojoin.yaml.j2 - dest: /etc/matrix-synapse/conf.d/autojoin.yaml - owner: matrix-synapse - group: nogroup - mode: 0644 - when: matrix_auto_join_rooms is defined - notify: Config matrix target - - name: Ensure password provider config is in place ansible.builtin.template: src: conf.d/password_providers.yaml.j2 diff --git a/roles/synapse/templates/conf.d/autojoin.yaml.j2 b/roles/synapse/templates/conf.d/autojoin.yaml.j2 index 346a22f..586b922 100644 --- a/roles/synapse/templates/conf.d/autojoin.yaml.j2 +++ b/roles/synapse/templates/conf.d/autojoin.yaml.j2 @@ -1,6 +1,3 @@ # {{ ansible_managed }} -auto_join_rooms: -{% for room_id in matrix_auto_join_rooms %} - - "{{ room_id }}" -{% endfor %} +auto_join_rooms: {{ matrix_auto_join_rooms }}