refactor to use new workers and routes they serve

roles/matrix-synapse/defaults/main.yml

@@ -265,31 +265,28 @@ matrix_synapse_workers_enabled: false
 
 # List of workers to spawn
 matrix_synapse_workers_enabled_list:
-  - { worker: synchrotron, port: 18082 }
-  - { worker: synchrotron, port: 18083 }
-  - { worker: synchrotron, port: 18084 }
-  - { worker: appservice, port: 18085 }
-  - { worker: client_reader, port: 18086 }
-  - { worker: event_creator, port: 18087 }
-  - { worker: federation_reader, port: 18088 }
-  - { worker: federation_sender, port: 18089 }
-  - { worker: frontend_proxy, port: 18090 }
-  - { worker: media_repository, port: 18091 }
-  - { worker: pusher, port: 18092 }
-  - { worker: user_dir, port: 18093 }
+  - { worker: generic_worker, port: 18101 }
+  - { worker: generic_worker, port: 18102 }
+  - { worker: generic_worker, port: 18103 }
+  - { worker: generic_worker, port: 18104 }
+  - { worker: generic_worker, port: 18105 }
+  - { worker: generic_worker, port: 18106 }
+  - { worker: pusher, port: 18201 }
+  - { worker: appservice, port: 18301 }
+  - { worker: federation_sender, port: 18401 }
+  - { worker: media_repository, port: 18501 }
+  - { worker: user_dir, port: 18502 }
+  - { worker: frontend_proxy, port: 18503 }
 
-# The list of available workers (2020-04-14)
+# The list of available workers (2020-08-28)
 matrix_synapse_workers_avail_list:
-  - appservice
-  - client_reader
-  - event_creator
-  - federation_reader
-  - federation_sender
-  - frontend_proxy
-  - media_repository
+  - generic_worker
   - pusher
-  - synchrotron
+  - appservice
+  - federation_sender
+  - media_repository
   - user_dir
+  - frontend_proxy
 
 # Ports used for communication between main synapse process and workers
 matrix_synapse_replication_tcp_port: 9092

roles/matrix-synapse/templates/synapse/worker.yaml.j2

@@ -11,9 +11,8 @@ worker_listeners:
     port: {{ item.port }}
     resources:
       - names:
-{% if item.worker in [ 'synchrotron', 'client_reader', 'event_creator', 'frontend_proxy', 'user_dir' ] %}
+{% if item.worker in [ 'generic_worker', 'frontend_proxy', 'user_dir' ] %}
         - client
-{% elif item.worker in [ 'federation_reader' ] %}
         - federation
 {% elif item.worker in [ 'media_repository' ] %}
         - media
@@ -23,7 +22,7 @@ worker_listeners:
 {% if item.worker == 'frontend_proxy' %}
 worker_main_http_uri: http://127.0.0.1:8008
 {% endif %}
-  
+
 worker_daemonize: false
 worker_pid_file: /matrix-run/{{ item.worker }}.port{{ item.port }}.pid
 worker_log_config: /data/{{ matrix_server_fqn_matrix }}.log.config