From d3910464318479ae5394b3085495517c0dba00b2 Mon Sep 17 00:00:00 2001 From: deathrow Date: Mon, 5 Dec 2022 15:43:41 -0500 Subject: [PATCH] Update --- .../include.d/event_additional_worker.conf | 22 +++++++++ swag/nginx/include.d/event_worker.conf | 33 +++++++++++++ swag/nginx/include.d/extra_worker.conf | 47 +++++++++++++++++++ swag/nginx/include.d/media-repo.conf | 4 ++ swag/nginx/include.d/reciept_worker.conf | 10 ++++ swag/nginx/include.d/upstream_workers.conf | 10 ++++ 6 files changed, 126 insertions(+) create mode 100644 swag/nginx/include.d/event_additional_worker.conf create mode 100644 swag/nginx/include.d/event_worker.conf create mode 100644 swag/nginx/include.d/extra_worker.conf create mode 100644 swag/nginx/include.d/media-repo.conf create mode 100644 swag/nginx/include.d/reciept_worker.conf diff --git a/swag/nginx/include.d/event_additional_worker.conf b/swag/nginx/include.d/event_additional_worker.conf new file mode 100644 index 0000000..9acf5a2 --- /dev/null +++ b/swag/nginx/include.d/event_additional_worker.conf @@ -0,0 +1,22 @@ +# Typing +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://additional1; +} + +# Device requests +location ~ ^/_matrix/client/(r0|v3|unstable)/sendToDevice/ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://additional1; +} + +# Account data requests +location ~ ^/_matrix/client/(r0|v3|unstable)/.*/tags { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://additional1; +} + +location ~ ^/_matrix/client/(r0|v3|unstable)/.*/account_data { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://additional1; +} diff --git a/swag/nginx/include.d/event_worker.conf b/swag/nginx/include.d/event_worker.conf new file mode 100644 index 0000000..592902c --- /dev/null +++ b/swag/nginx/include.d/event_worker.conf @@ -0,0 +1,33 @@ +# Event sending requests +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; + +} + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/join/ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; + +} + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} \ No newline at end of file diff --git a/swag/nginx/include.d/extra_worker.conf b/swag/nginx/include.d/extra_worker.conf new file mode 100644 index 0000000..6ca23c8 --- /dev/null +++ b/swag/nginx/include.d/extra_worker.conf @@ -0,0 +1,47 @@ +# GET Requests +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/messages$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + +# For all SSO providers +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/login/sso/redirect { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://sso_worker_lc; +} + +location ~ ^/_synapse/client/p^/_synapse/client/oidc/callback$ew_user_consent$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://sso_worker_lc; +} + +location ~ ^/_synapse/client/sso_register$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://sso_worker_lc; +} + +# OpenID Connect requests + +location ~ ^/_synapse/client/oidc/callback$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + +# SAML requests + +location ~ ^/_synapse/client/saml2/authn_response$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} + +# CAS requests. + +location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/login/cas/ticket$ { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} \ No newline at end of file diff --git a/swag/nginx/include.d/media-repo.conf b/swag/nginx/include.d/media-repo.conf new file mode 100644 index 0000000..c15c04d --- /dev/null +++ b/swag/nginx/include.d/media-repo.conf @@ -0,0 +1,4 @@ +location ^~ /_matrix/media { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://generic_worker_lc; +} \ No newline at end of file diff --git a/swag/nginx/include.d/reciept_worker.conf b/swag/nginx/include.d/reciept_worker.conf new file mode 100644 index 0000000..f4ad340 --- /dev/null +++ b/swag/nginx/include.d/reciept_worker.conf @@ -0,0 +1,10 @@ +# Receipts requests +location ~ ^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://additional2; +} + +location ~ ^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers { + include /config/nginx/include.d/synapse-proxy.conf; + proxy_pass http://additional2; +} diff --git a/swag/nginx/include.d/upstream_workers.conf b/swag/nginx/include.d/upstream_workers.conf index 0f6d4a5..7868211 100644 --- a/swag/nginx/include.d/upstream_workers.conf +++ b/swag/nginx/include.d/upstream_workers.conf @@ -14,6 +14,16 @@ upstream generic_worker_lc { server synapse-generic-worker-4:8081; } +upstream additional1_worker_lc { + least_conn; + server additional1:8081; +} + +upstream sso_worker_lc { + least_conn; + server synapse-generic-worker-4:8081; +} + # extract username from token get parameter map $arg_access_token $token_from_arg { default $arg_access_token;