From 2c3ff9cb17824bbb50746771654897f3777f54d4 Mon Sep 17 00:00:00 2001 From: Rory& Date: Tue, 10 Sep 2024 04:00:35 +0200 Subject: Fix synapse nginx paths --- host/Rory-nginx/services/matrix/synapse/synapse-main.nix | 2 +- .../services/matrix/synapse/workers/event-creator.nix | 12 ++++++------ .../workers/stream-writers/account_data-stream-writer.nix | 4 ++-- .../workers/stream-writers/presence-stream-writer.nix | 2 +- .../workers/stream-writers/push_rule-stream-writer.nix | 2 +- .../synapse/workers/stream-writers/receipt-stream-writer.nix | 4 ++-- .../workers/stream-writers/to_device-stream-writer.nix | 2 +- .../synapse/workers/stream-writers/typing-stream-writer.nix | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix index 3b5bf26..194eca6 100755 --- a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix +++ b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix @@ -42,7 +42,7 @@ server_name = "rory.gay"; # use_frozen_dicts = true; - user_agent_suffix = " (rory.gay)"; +# user_agent_suffix = " (rory.gay)"; # look into later: replication_torture_level - https://github.com/element-hq/synapse/blob/develop/synapse/config/server.py#L560 # limit_remote_rooms ??? diff --git a/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix b/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix index 115ce51..2be7a5b 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix @@ -7,12 +7,12 @@ let workerName = "event_creator"; workerRoutes = { client = [ - "^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact" - "^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send" - "^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$" - "^/_matrix/client/(api/v1|r0|v3|unstable)/join/" - "^/_matrix/client/(api/v1|r0|v3|unstable)/knock/" - "^/_matrix/client/(api/v1|r0|v3|unstable)/profile/" + "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact" + "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send" + "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$" + "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/join/" + "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/knock/" + "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/" ]; federation = [ ]; media = [ ]; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix index dff6e36..48649f6 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix @@ -8,8 +8,8 @@ let workerName = "account_data_stream_writer"; workerRoutes = { client = [ - "^/_matrix/client/(r0|v3|unstable)/.*/tags" - "^/_matrix/client/(r0|v3|unstable)/.*/account_data" + "~ ^/_matrix/client/(r0|v3|unstable)/.*/tags" + "~ ^/_matrix/client/(r0|v3|unstable)/.*/account_data" ]; federation = [ ]; media = [ ]; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix index 69d4813..e6487ca 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix @@ -7,7 +7,7 @@ let workers = lib.range 0 (cfg.presenceStreamWriters - 1); workerName = "presence_stream_writer"; workerRoutes = { - client = [ "^/_matrix/client/(api/v1|r0|v3|unstable)/presence/" ]; + client = [ "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/" ]; federation = [ ]; media = [ ]; }; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix index fbd0327..4a4af04 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix @@ -7,7 +7,7 @@ let workers = lib.range 0 (cfg.pushRuleStreamWriters - 1); workerName = "push_rule_stream_writer"; workerRoutes = { - client = [ "^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/" ]; + client = [ "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/" ]; federation = [ ]; media = [ ]; }; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix index da4e3a2..54c31b4 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix @@ -8,8 +8,8 @@ let workerName = "receipts_stream_writer"; workerRoutes = { client = [ - "^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt" - "^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers" + "~ ^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt" + "~ ^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers" ]; federation = [ ]; media = [ ]; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix index 47c2c0a..2b487d6 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix @@ -7,7 +7,7 @@ let workers = lib.range 0 (cfg.toDeviceStreamWriters - 1); workerName = "to_device_stream_writer"; workerRoutes = { - client = [ "^/_matrix/client/(r0|v3|unstable)/sendToDevice/" ]; + client = [ "~ ^/_matrix/client/(r0|v3|unstable)/sendToDevice/" ]; federation = [ ]; media = [ ]; }; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix index 3986619..5bff505 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix @@ -7,7 +7,7 @@ let workers = lib.range 0 (cfg.typingStreamWriters - 1); workerName = "typing_stream_writer"; workerRoutes = { - client = [ "^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing" ]; + client = [ "~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing" ]; federation = [ ]; media = [ ]; }; -- cgit 1.4.1