From 3d0c3a2b29490e72af25c352f6ca364d2274c2ee Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Wed, 17 Nov 2021 22:31:04 +0100
Subject: [PATCH] matrix-synapse: Fix body size header when
recommendedProxySettings=true
---
modules/matrix-homeserver/reverse-proxy.nix | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/modules/matrix-homeserver/reverse-proxy.nix b/modules/matrix-homeserver/reverse-proxy.nix
index 1f752da..74fb462 100644
--- a/modules/matrix-homeserver/reverse-proxy.nix
+++ b/modules/matrix-homeserver/reverse-proxy.nix
@@ -5,12 +5,15 @@ let
cfg = config.queezle.matrix-homeserver;
proxyLocationConfig = {
# Add required headers, but only if recommendedProxySettings is disabled
- extraConfig = mkIf (!config.services.nginx.recommendedProxySettings) ''
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header X-Forwarded-Proto $scheme;
- client_max_body_size ${cfg.settings.max_upload_size};
- '';
+ extraConfig = mkMerge [
+ (mkIf (!config.services.nginx.recommendedProxySettings) ''
+ proxy_set_header Host $host;
+ proxy_set_header X-Forwarded-For $remote_addr;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ '')
+ # 50M is the current synapse default, update if that changes
+ "client_max_body_size ${cfg.settings.max_upload_size or "50M"};"
+ ];
proxyPass = "http://127.0.0.1:8008";
};
in {
--
GitLab