From 6a5cb6f996caa1b6e7f5523f6e5b0a51711489d5 Mon Sep 17 00:00:00 2001
From: creme <creme@envs.net>
Date: Tue, 5 Apr 2022 16:50:02 +0200
Subject: [PATCH] update generic_worker locations

Signed-off-by: creme <creme@envs.net>
---
 .../workers/additional1_log_config.yaml       |  2 +-
 .../workers/presence_log_config.yaml          |  2 +-
 etc/nginx/include.d/generic_worker.conf       | 35 +++----------------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/etc/matrix-synapse/workers/additional1_log_config.yaml b/etc/matrix-synapse/workers/additional1_log_config.yaml
index 8ccaa7a..40c552d 100644
--- a/etc/matrix-synapse/workers/additional1_log_config.yaml
+++ b/etc/matrix-synapse/workers/additional1_log_config.yaml
@@ -19,7 +19,7 @@ handlers:
     file:
         class: logging.handlers.TimedRotatingFileHandler
         formatter: precise
-        filename: /var/log/matrix-synapse/additional1.log
+        filename: /var/log/matrix-synapse/worker_additional1.log
         when: midnight
         backupCount: 2  # Does not include the current log file.
         encoding: utf8
diff --git a/etc/matrix-synapse/workers/presence_log_config.yaml b/etc/matrix-synapse/workers/presence_log_config.yaml
index 3ce9e76..0304ee9 100644
--- a/etc/matrix-synapse/workers/presence_log_config.yaml
+++ b/etc/matrix-synapse/workers/presence_log_config.yaml
@@ -19,7 +19,7 @@ handlers:
     file:
         class: logging.handlers.TimedRotatingFileHandler
         formatter: precise
-        filename: /var/log/matrix-synapse/presence.log
+        filename: /var/log/matrix-synapse/worker_presence.log
         when: midnight
         backupCount: 2  # Does not include the current log file.
         encoding: utf8
diff --git a/etc/nginx/include.d/generic_worker.conf b/etc/nginx/include.d/generic_worker.conf
index 8a421bd..474e67d 100644
--- a/etc/nginx/include.d/generic_worker.conf
+++ b/etc/nginx/include.d/generic_worker.conf
@@ -7,12 +7,12 @@
 #
 
 ## Sync requests
-location ~ ^/_matrix/client/(v2_alpha|r0|v3)/sync$ {
+location ~ ^/_matrix/client/(r0|v3)/sync$ {
 	include include.d/synapse-proxy.conf;
 	proxy_pass http://localhost:8083;
 }
 
-location ~ ^/_matrix/client/(api/v1|v2_alpha|r0|v3)/events$ {
+location ~ ^/_matrix/client/(api/v1|r0|v3)/events$ {
 	include include.d/synapse-proxy.conf;
 	proxy_pass http://generic_worker_lc;
 }
@@ -74,37 +74,17 @@ location ~ ^/_matrix/federation/v1/make_leave/ {
 	proxy_pass http://generic_worker_lc;
 }
 
-location ~ ^/_matrix/federation/v1/send_join/ {
+location ~ ^/_matrix/federation/(v1|v2)/send_join/ {
 	include include.d/synapse-proxy.conf;
 	proxy_pass http://generic_worker_lc;
 }
 
-location ~ ^/_matrix/federation/v2/send_join/ {
+location ~ ^/_matrix/federation/(v1|v2)/send_leave/ {
 	include include.d/synapse-proxy.conf;
 	proxy_pass http://generic_worker_lc;
 }
 
-location ~ ^/_matrix/federation/v1/send_leave/ {
-	include include.d/synapse-proxy.conf;
-	proxy_pass http://generic_worker_lc;
-}
-
-location ~ ^/_matrix/federation/v2/send_leave/ {
-	include include.d/synapse-proxy.conf;
-	proxy_pass http://generic_worker_lc;
-}
-
-location ~ ^/_matrix/federation/v1/invite/ {
-	include include.d/synapse-proxy.conf;
-	proxy_pass http://generic_worker_lc;
-}
-
-location ~ ^/_matrix/federation/v2/invite/ {
-	include include.d/synapse-proxy.conf;
-	proxy_pass http://generic_worker_lc;
-}
-
-location ~ ^/_matrix/federation/v1/query_auth/ {
+location ~ ^/_matrix/federation/(v1|v2)/invite/ {
 	include include.d/synapse-proxy.conf;
 	proxy_pass http://generic_worker_lc;
 }
@@ -178,11 +158,6 @@ location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state$ {
 	proxy_pass http://generic_worker_lc;
 }
 
-location ~ ^/_matrix/client/unstable/org.matrix.msc2946/rooms/.*/spaces$ {
-	include include.d/synapse-proxy.conf;
-	proxy_pass http://generic_worker_lc;
-}
-
 location ~ ^/_matrix/client/(v1|unstable/org.matrix.msc2946)/rooms/.*/hierarchy$ {
 	include include.d/synapse-proxy.conf;
 	proxy_pass http://generic_worker_lc;