uumas/ansible-matrix
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Remove frontend proxy worker

Browse Source
This commit is contained in:
uumas
2023-04-25 21:39:51 +03:00
parent 0033ffc405
commit d1bbd974ab
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/vars/nginx.yml
View File

@@ -60,6 +60,7 @@ nginx_upstreams:
- name: '~ ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/changes$' - name: '~ ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/changes$'
- name: '~ ^/_matrix/client/(r0|v3|unstable)/keys/claim$' - name: '~ ^/_matrix/client/(r0|v3|unstable)/keys/claim$'
- name: '~ ^/_matrix/client/(r0|v3|unstable)/room_keys/' - name: '~ ^/_matrix/client/(r0|v3|unstable)/room_keys/'
- name: '~ ^/_matrix/client/(r0|v3|unstable)/keys/upload/'
synapse_generic_login: synapse_generic_login:
servers: "{{ synapse_workers.generic_login | default('') }}" servers: "{{ synapse_workers.generic_login | default('') }}"
locations: locations:
@@ -128,11 +129,6 @@ nginx_upstreams:
servers: "{{ synapse_workers.user_dir | default('') }}" servers: "{{ synapse_workers.user_dir | default('') }}"
locations: locations:
- name: '~ ^/_matrix/client/(r0|v3|unstable)/user_directory/search$' - 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: synapse_media_repository:
servers: "{{ synapse_workers.media_repository | default('') }}" servers: "{{ synapse_workers.media_repository | default('') }}"
locations: locations:
@@ -245,7 +241,6 @@ nginx_servers:
- synapse_generic_event_send - synapse_generic_event_send
- synapse_generic_pagination - synapse_generic_pagination
- synapse_user_dir - synapse_user_dir
- synapse_frontend_proxy
- synapse_device_persister - synapse_device_persister
- synapse_typing_persister - synapse_typing_persister
- synapse_account_persister - synapse_account_persister

3
roles/synapse/templates/worker.yaml.j2
View File

@@ -24,6 +24,3 @@ worker_listeners:
bind_addresses: ['0.0.0.0'] # Don't bind to multiple addresses bind_addresses: ['0.0.0.0'] # Don't bind to multiple addresses
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if worker_app == 'frontend_proxy' %}
worker_main_http_uri: http://localhost:8008
{% endif %}

3
roles/synapse/vars/frontend_proxy.yml
View File

@@ -1,3 +1,4 @@
--- ---
worker_app: frontend_proxy # LEGACY
worker_state: absent