From 3bbfebb5c1874096a000882faf3c5da4223f8c1b Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 9 Dec 2022 10:25:25 +0100 Subject: [PATCH] fix hashing for upstream normal_sync --- synapse-module/nginx.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/synapse-module/nginx.nix b/synapse-module/nginx.nix index 6e42a3f..eb42346 100644 --- a/synapse-module/nginx.nix +++ b/synapse-module/nginx.nix @@ -154,9 +154,6 @@ in in if fedReceivers != [ ] then lib.genAttrs socketAddresses (_: { }) else config.services.nginx.upstreams.synapse_master.servers; - extraConfig = '' - hash $mxid_localpart consistent; - ''; }; @@ -173,12 +170,17 @@ in }; - services.nginx.upstreams.synapse_worker_normal_sync.servers = let - normalSyncers = getWorkersOfType "normal-sync"; - socketAddresses = generateSocketAddresses "client" normalSyncers; - in if normalSyncers != [ ] then - lib.genAttrs socketAddresses (_: { }) - else config.services.nginx.upstreams.synapse_master.server; + services.nginx.upstreams.synapse_worker_normal_sync = { + servers = let + normalSyncers = getWorkersOfType "normal-sync"; + socketAddresses = generateSocketAddresses "client" normalSyncers; + in if normalSyncers != [ ] then + lib.genAttrs socketAddresses (_: { }) + else config.services.nginx.upstreams.synapse_master.server; + extraConfig = '' + hash $mxid_localpart consistent; + ''; + };