From d1bbd974aba02bcb512e905c0109263d85244b90 Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Tue, 25 Apr 2023 21:39:51 +0300
Subject: [PATCH] Remove frontend proxy worker

---
 playbooks/vars/nginx.yml               | 7 +------
 roles/synapse/templates/worker.yaml.j2 | 3 ---
 roles/synapse/vars/frontend_proxy.yml  | 3 ++-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/playbooks/vars/nginx.yml b/playbooks/vars/nginx.yml
index fd2b9a3..c3294ca 100644
--- a/playbooks/vars/nginx.yml
+++ b/playbooks/vars/nginx.yml
@@ -60,6 +60,7 @@ nginx_upstreams:
       - name: '~ ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/changes$'
       - name: '~ ^/_matrix/client/(r0|v3|unstable)/keys/claim$'
       - name: '~ ^/_matrix/client/(r0|v3|unstable)/room_keys/'
+      - name: '~ ^/_matrix/client/(r0|v3|unstable)/keys/upload/'
   synapse_generic_login:
     servers: "{{ synapse_workers.generic_login | default('') }}"
     locations:
@@ -128,11 +129,6 @@ nginx_upstreams:
     servers: "{{ synapse_workers.user_dir | default('') }}"
     locations:
       - name: '~ ^/_matrix/client/(r0|v3|unstable)/user_directory/search$'
-  synapse_frontend_proxy:
-    servers: "{{ synapse_workers.frontend_proxy | default('') }}"
-    locations:
-      - name: '~ ^/_matrix/client/(r0|v3|unstable)/keys/upload'
-      - name: "{{ '~ ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/[^/]+/status' if synapse_presence is defined and not synapse_presence else '' }}"
   synapse_media_repository:
     servers: "{{ synapse_workers.media_repository | default('') }}"
     locations:
@@ -245,7 +241,6 @@ nginx_servers:
       - synapse_generic_event_send
       - synapse_generic_pagination
       - synapse_user_dir
-      - synapse_frontend_proxy
       - synapse_device_persister
       - synapse_typing_persister
       - synapse_account_persister
diff --git a/roles/synapse/templates/worker.yaml.j2 b/roles/synapse/templates/worker.yaml.j2
index 6c01ee1..7dc46b9 100644
--- a/roles/synapse/templates/worker.yaml.j2
+++ b/roles/synapse/templates/worker.yaml.j2
@@ -24,6 +24,3 @@ worker_listeners:
     bind_addresses: ['0.0.0.0'] # Don't bind to multiple addresses
 {% endif %}
 {% endif %}
-{% if worker_app == 'frontend_proxy' %}
-worker_main_http_uri: http://localhost:8008
-{% endif %}
diff --git a/roles/synapse/vars/frontend_proxy.yml b/roles/synapse/vars/frontend_proxy.yml
index 1f733a0..59ef5d3 100644
--- a/roles/synapse/vars/frontend_proxy.yml
+++ b/roles/synapse/vars/frontend_proxy.yml
@@ -1,3 +1,4 @@
 ---
 
-worker_app: frontend_proxy
+# LEGACY
+worker_state: absent