simplify matrix_auto_join_users

roles/synapse/defaults/main.yml

@@ -9,10 +9,4 @@ matrix_max_upload_size_mb: 100
 synapse_metrics: false
 synapse_presence: true
 
-persister_workers:
+matrix_auto_join_rooms: []
-  - event_persister
-  - typing_persister
-  - account_persister
-  - device_persister
-  - presence_persister
-  - receipt_persister

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

roles/synapse/tasks/worker_type.yml

@@ -5,13 +5,13 @@
     worker_type: "{{ synapse_worker.key }}"
 
 - name: Include default variables
-  ansible.builtin.include_vars: defaults.yml
+  ansible.builtin.include_vars: workers/defaults.yml
 
 - name: Include variables for {{ worker_type }}
   ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - files:
-        - "{{ worker_type }}.yml"
+        - "workers/{{ worker_type }}.yml"
       skip: true
 
 - name: Warn of legacy workers

roles/synapse/templates/conf.d/autojoin.yaml.j2

@@ -1,6 +1,3 @@
 # {{ ansible_managed }}
 
-auto_join_rooms:
+auto_join_rooms: {{ matrix_auto_join_rooms }}
-{% for room_id in matrix_auto_join_rooms %}
-  - "{{ room_id }}"
-{% endfor %}

roles/synapse/vars/main.yml

@@ -0,0 +1,9 @@
+---
+
+persister_workers:
+  - event_persister
+  - typing_persister
+  - account_persister
+  - device_persister
+  - presence_persister
+  - receipt_persister