diff --git a/flake.lock b/flake.lock
index a3f7d84..d7dbde4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -108,11 +108,11 @@
]
},
"locked": {
- "lastModified": 1746881400,
- "narHash": "sha256-zK0FBh70HQyo/5TtoIQnyiLg7hNW7OF6GCTyJPDb3cg=",
+ "lastModified": 1746960839,
+ "narHash": "sha256-YOov+78fsGBZGj2JQQQDozflSLJA1Wo4tRODFi2srto=",
"ref": "refs/heads/master",
- "rev": "1fe0b3a2a1e3a847cd9fd8c38c6e10f4f035e623",
- "revCount": 1659,
+ "rev": "863a3817820d28d8026f6d73de304b43cb60f6fa",
+ "revCount": 1660,
"type": "git",
"url": "https://cgit.rory.gay/cgit-magenta.git"
},
@@ -132,11 +132,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1746811450,
- "narHash": "sha256-QmR/Uabe9b4McMITsg4TEasx5UpdFGpQ8+0rdmEWqyA=",
+ "lastModified": 1747073949,
+ "narHash": "sha256-cLPfgRchYLJXA13Xr1Yg3v+O/7SvxWYIAxaKvnsm7HM=",
"owner": "famedly",
"repo": "conduit",
- "rev": "17f56081ce2827440f71240782594f1a9b69c347",
+ "rev": "ff7b2af80db5e5dd2dddc02e42e8fd27abb6955f",
"type": "gitlab"
},
"original": {
@@ -225,11 +225,11 @@
"draupnirSrc": {
"flake": false,
"locked": {
- "lastModified": 1746879414,
- "narHash": "sha256-MxbZeNUlTf8kNhDx9vo6o9lCzKWx1x/jp1GTjzOaujE=",
+ "lastModified": 1747652125,
+ "narHash": "sha256-eUAOWxlloj5mUlosNyP3iKXpohrUE1+d9M3JM4zJuyU=",
"owner": "the-draupnir-project",
"repo": "Draupnir",
- "rev": "0bad7b29b0e5c345627c531d0b228532f39a2f58",
+ "rev": "8ccbe86d199319894276f447d292d810853f9bd5",
"type": "github"
},
"original": {
@@ -569,11 +569,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1746798521,
- "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=",
+ "lastModified": 1747747328,
+ "narHash": "sha256-3Gc5CqAJqpvI4gIU1Oxbl5w440b+rY9HvDzs5C0ChBA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c",
+ "rev": "65d2282ff6cf560f54997013bd1e575fbd0a7ebf",
"type": "github"
},
"original": {
@@ -904,11 +904,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1746705351,
- "narHash": "sha256-u3u7G+2G2vZ0UYMU5SVUw801tP3IqZq4MbHKOOzNRxA=",
+ "lastModified": 1747148958,
+ "narHash": "sha256-HCk1dTvaDY+W2tg3uP0feSeZfcOaWyTklwZFc2E8zUU=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "ca9c376076b1e142c94277c741984f70283c24a1",
+ "rev": "67743d5715071afa4a2b8553321dccf5339a330d",
"type": "github"
},
"original": {
@@ -921,11 +921,11 @@
"mtxclientSrc": {
"flake": false,
"locked": {
- "lastModified": 1742046560,
- "narHash": "sha256-UM1orYMq6kxaqLuMWtUHxHQ/Yl3VSXhHEP/tfTOIqVU=",
+ "lastModified": 1747613595,
+ "narHash": "sha256-NthiRLkYoTXM65tndD8cDD1L+zbywzmGbyqwsa/KYu8=",
"owner": "Nheko-reborn",
"repo": "mtxclient",
- "rev": "c888090b8c04be22c438461a2cfd787454fe15ad",
+ "rev": "a9578b8a697074b9c86118ca75b34bdb01ba82d2",
"type": "github"
},
"original": {
@@ -1045,11 +1045,11 @@
},
"nixpkgs-Draupnir": {
"locked": {
- "lastModified": 1744859637,
- "narHash": "sha256-aBC43eomBgw1/iJqLC9PlQ8t85orUzto4ONL//J3KVc=",
+ "lastModified": 1747497891,
+ "narHash": "sha256-8x1vaJfBQKHHjK6T8h/bLfKOJgP18kVskN5j2fLg0vQ=",
"owner": "TheArcaneBrony",
"repo": "nixpkgs",
- "rev": "eb6abb00725eea8b969dfd6402496c14ff84cf3a",
+ "rev": "596cb4db3f6531f637d116c7a5f8566a91ae6cd3",
"type": "github"
},
"original": {
@@ -1077,11 +1077,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1746881429,
- "narHash": "sha256-ZZZwtN6CTCBvB3Wz51SVaWil1mK4tAqgJAEbsc4XUUM=",
+ "lastModified": 1747748004,
+ "narHash": "sha256-3S4SJNbJro2pFVXxROvyu8fb9yOTDzSaWfSOb50rHZw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6380817654ed6c3f87715814016723e9d0d2cab3",
+ "rev": "8db79028d5614a0d3f5ce020d6b7cd7ff597e32d",
"type": "github"
},
"original": {
@@ -1091,29 +1091,13 @@
"type": "github"
}
},
- "nixpkgs-keydb": {
- "locked": {
- "lastModified": 1727211877,
- "narHash": "sha256-zy/ar3GpnzuGRCwrr6zV/QicoZcqd2kNNhkRDECfStU=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "e0464e47880a69896f0fb1810f00e0de469f770a",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "e0464e47880a69896f0fb1810f00e0de469f770a",
- "type": "github"
- }
- },
"nixpkgs-master": {
"locked": {
- "lastModified": 1746881429,
- "narHash": "sha256-ZZZwtN6CTCBvB3Wz51SVaWil1mK4tAqgJAEbsc4XUUM=",
+ "lastModified": 1747748004,
+ "narHash": "sha256-3S4SJNbJro2pFVXxROvyu8fb9yOTDzSaWfSOb50rHZw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6380817654ed6c3f87715814016723e9d0d2cab3",
+ "rev": "8db79028d5614a0d3f5ce020d6b7cd7ff597e32d",
"type": "github"
},
"original": {
@@ -1157,11 +1141,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1746557022,
- "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
+ "lastModified": 1747485343,
+ "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
+ "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
"type": "github"
},
"original": {
@@ -1253,11 +1237,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1746461020,
- "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
+ "lastModified": 1747327360,
+ "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
+ "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
"type": "github"
},
"original": {
@@ -1285,11 +1269,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1746663147,
- "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
+ "lastModified": 1747542820,
+ "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
+ "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
"type": "github"
},
"original": {
@@ -1321,7 +1305,7 @@
},
"locked": {
"lastModified": 1737779835,
- "narHash": "sha256-iZ/kQ/XFqIx053AuSHhCwu3HA8627ognYiJl/LRNpD0=",
+ "narHash": "sha256-TY7cnYqhgxIXZCltcFxYuKQ6Hpt3gouuYn0rj9URsp4=",
"ref": "refs/heads/master",
"rev": "11cc65efa2909bdc7e3e978bf1f56f6d141bf82a",
"revCount": 11,
@@ -1392,7 +1376,6 @@
"nixpkgs-Draupnir": "nixpkgs-Draupnir",
"nixpkgs-DraupnirPkg": "nixpkgs-DraupnirPkg",
"nixpkgs-RoryNix": "nixpkgs-RoryNix",
- "nixpkgs-keydb": "nixpkgs-keydb",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_3",
"ooye": "ooye",
@@ -1439,11 +1422,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1746485181,
- "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
+ "lastModified": 1747603214,
+ "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
+ "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 7a43916..2d98cfa 100755
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,7 @@
# Draupnir module/package
nixpkgs-Draupnir.url = "github:TheArcaneBrony/nixpkgs/module/draupnir";
nixpkgs-DraupnirPkg.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
- nixpkgs-keydb.url = "github:NixOS/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
+# nixpkgs-keydb.url = "github:NixOS/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
#MatrixContentFilter.url = "git+file:/home/Rory/git/matrix/MatrixContentFilter?submodules=1";
# Base modules
@@ -150,7 +150,7 @@
matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped;
#draupnir = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
draupnir = inputs.nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- keydb = inputs.nixpkgs-keydb.legacyPackages.${pkgs.stdenv.hostPlatform.system}.keydb;
+# keydb = inputs.nixpkgs-keydb.legacyPackages.${pkgs.stdenv.hostPlatform.system}.keydb;
matrix-synapse-plugins.synapse-http-antispam = prev.matrix-synapse-plugins.synapse-http-antispam.overrideAttrs (oldAttrs: {
src = inputs.synapseHttpAntispamSrc;
version = inputs.synapseHttpAntispamSrc.rev;
diff --git a/host/Module-dev/set/matrix/root.nix b/host/Module-dev/set/matrix/root.nix
index 22fb2d9..83636d2 100644
--- a/host/Module-dev/set/matrix/root.nix
+++ b/host/Module-dev/set/matrix/root.nix
@@ -184,7 +184,7 @@ in
};
services.redis = {
- package = pkgs.keydb;
+ package = pkgs.valkey;
servers.matrix-synapse = {
enable = true;
user = "matrix-synapse";
diff --git a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
index ae63b82..d65b614 100644
--- a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
+++ b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
@@ -210,7 +210,7 @@
};
services.redis = {
- package = pkgs.keydb;
+ package = pkgs.valkey;
servers.matrix-synapse = {
enable = true;
user = "matrix-synapse";
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/auth.nix b/host/Rory-nginx/services/matrix/synapse/workers/auth.nix
index 3c8d1e9..9ff7131 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/auth.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/auth.nix
@@ -97,6 +97,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
index a95d42e..0972ed6 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
@@ -115,13 +115,15 @@ in
value = {
extraConfig = ''
keepalive 32;
- least_conn;
+# least_conn;
+ hash $request_uri consistent;
'';
servers = lib.listToAttrs (
lib.map (index: {
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 2be7a5b..e6d81ce 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix
@@ -86,13 +86,15 @@ in
value = {
extraConfig = ''
keepalive 32;
- least_conn;
+# least_conn;
+ hash $request_uri consistent;
'';
servers = lib.listToAttrs (
lib.map (index: {
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = "0s";
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-inbound.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-inbound.nix
index effaa69..c79db7b 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-inbound.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-inbound.nix
@@ -86,6 +86,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
index 29af9fb..8bbcaba 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
@@ -112,6 +112,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix
index 468916e..3a768f8 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix
@@ -88,6 +88,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/media-repo.nix b/host/Rory-nginx/services/matrix/synapse/workers/media-repo.nix
index 1e0c638..439bdba 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/media-repo.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/media-repo.nix
@@ -107,6 +107,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/pusher.nix b/host/Rory-nginx/services/matrix/synapse/workers/pusher.nix
index edf1632..3d3a81d 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/pusher.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/pusher.nix
@@ -87,6 +87,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 48649f6..1461844 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
@@ -92,6 +92,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
index 5395aea..bc79e90 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
@@ -89,6 +89,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 e6487ca..2be66aa 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
@@ -89,6 +89,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 4a4af04..da75a71 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
@@ -89,6 +89,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 54c31b4..cb804b7 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
@@ -92,6 +92,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix
index 5fd0bd0..41ff4aa 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix
@@ -95,6 +95,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 2b487d6..ee7e9a4 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
@@ -89,6 +89,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
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 5bff505..ead3f2b 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
@@ -89,6 +89,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/sync.nix b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
index c9f175f..a03f232 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
@@ -92,6 +92,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/host/Rory-ovh/services/containers/draupnir-cme/container.nix b/host/Rory-ovh/services/containers/draupnir-cme/container.nix
index ec85e2f..f9aaa58 100755
--- a/host/Rory-ovh/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/container.nix
@@ -1,10 +1,11 @@
-{ nixpkgs-Draupnir, ... }:
+{ nixpkgs-Draupnir, nixpkgs-DraupnirPkg, ... }:
{
privateNetwork = true;
autoStart = true;
specialArgs = {
inherit nixpkgs-Draupnir;
+ inherit nixpkgs-DraupnirPkg;
};
config =
{ lib, pkgs, ... }:
@@ -17,7 +18,7 @@
];
nixpkgs.overlays = [
(final: prev: {
- draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
+ draupnir = nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
})
];
};
diff --git a/host/Rory-ovh/services/containers/draupnir-fedora/container.nix b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
index 2d0f8d1..42451b9 100644
--- a/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
@@ -1,10 +1,11 @@
-{ nixpkgs-Draupnir, ... }:
+{ nixpkgs-Draupnir, nixpkgs-DraupnirPkg, ... }:
{
privateNetwork = true;
autoStart = true;
specialArgs = {
inherit nixpkgs-Draupnir;
+ inherit nixpkgs-DraupnirPkg;
};
config =
{ lib, pkgs, ... }:
@@ -17,7 +18,7 @@
];
nixpkgs.overlays = [
(final: prev: {
- draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
+ draupnir = nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
})
];
};
diff --git a/host/Rory-ovh/services/matrix/synapse/synapse-main.nix b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
index 31890da..30ef315 100755
--- a/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
+++ b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
@@ -53,13 +53,13 @@
# look into later: replication_torture_level - https://github.com/element-hq/synapse/blob/develop/synapse/config/server.py#L560
# limit_remote_rooms ???
# cleanup_extremities_with_dummy_events - default=True
- # dummy_devents_treshold - default=10 - required forward extremities to send dummy event
+ # dummy_events_threshold - default=10 - required forward extremities to send dummy event
# enable_ephemeral_messages - default=False - ???
# rooms_to_exclude_from_sync - default=[] - room ids...
# third_party_event_rules - https://github.com/element-hq/synapse/blob/develop/synapse/config/third_party_event_rules.py - ???
# default_power_level_content_override - default=None - https://github.com/element-hq/synapse/blob/develop/synapse/config/room.py#L73
- dummy_devents_treshold = 2;
+ dummy_events_threshold = 5;
cleanup_extremities_with_dummy_events = true;
enable_registration = true;
@@ -114,7 +114,7 @@
}
];
presence = {
- enablee = true;
+ enable = true;
update_interval = 60;
};
database = (
@@ -230,7 +230,7 @@
#};
services.redis = {
- package = pkgs.keydb;
+ package = pkgs.valkey;
servers.matrix-synapse = {
enable = true;
user = "matrix-synapse";
diff --git a/modules/software-templates/synapse-workers/generic.nix b/modules/software-templates/synapse-workers/generic.nix
index d524baf..9000006 100644
--- a/modules/software-templates/synapse-workers/generic.nix
+++ b/modules/software-templates/synapse-workers/generic.nix
@@ -122,6 +122,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/auth.nix b/modules/software-templates/synapse-workers/generic/auth.nix
index e4bde12..faf3198 100644
--- a/modules/software-templates/synapse-workers/generic/auth.nix
+++ b/modules/software-templates/synapse-workers/generic/auth.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/client-reader.nix b/modules/software-templates/synapse-workers/generic/client-reader.nix
index 48de092..f27b6a2 100644
--- a/modules/software-templates/synapse-workers/generic/client-reader.nix
+++ b/modules/software-templates/synapse-workers/generic/client-reader.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/event-creator.nix b/modules/software-templates/synapse-workers/generic/event-creator.nix
index c29d5e0..21f6128 100644
--- a/modules/software-templates/synapse-workers/generic/event-creator.nix
+++ b/modules/software-templates/synapse-workers/generic/event-creator.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/federation-inbound.nix b/modules/software-templates/synapse-workers/generic/federation-inbound.nix
index 0e118ef..3362960 100644
--- a/modules/software-templates/synapse-workers/generic/federation-inbound.nix
+++ b/modules/software-templates/synapse-workers/generic/federation-inbound.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/federation-reader.nix b/modules/software-templates/synapse-workers/generic/federation-reader.nix
index fb2fb20..f3baf1d 100644
--- a/modules/software-templates/synapse-workers/generic/federation-reader.nix
+++ b/modules/software-templates/synapse-workers/generic/federation-reader.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/federation-sender.nix b/modules/software-templates/synapse-workers/generic/federation-sender.nix
index 6d29ae5..9ab3285 100644
--- a/modules/software-templates/synapse-workers/generic/federation-sender.nix
+++ b/modules/software-templates/synapse-workers/generic/federation-sender.nix
@@ -100,6 +100,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/media-repo.nix b/modules/software-templates/synapse-workers/generic/media-repo.nix
index af0d7b5..eef5574 100644
--- a/modules/software-templates/synapse-workers/generic/media-repo.nix
+++ b/modules/software-templates/synapse-workers/generic/media-repo.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/pusher.nix b/modules/software-templates/synapse-workers/generic/pusher.nix
index b496edb..20e88a3 100644
--- a/modules/software-templates/synapse-workers/generic/pusher.nix
+++ b/modules/software-templates/synapse-workers/generic/pusher.nix
@@ -81,6 +81,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/generic/sync.nix b/modules/software-templates/synapse-workers/generic/sync.nix
index 6ababee..d3ff94c 100644
--- a/modules/software-templates/synapse-workers/generic/sync.nix
+++ b/modules/software-templates/synapse-workers/generic/sync.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix
index 5e540b3..8ba6690 100644
--- a/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix
@@ -100,6 +100,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix
index 7160902..ee6ae20 100644
--- a/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix
@@ -81,6 +81,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/presence-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/presence-stream-writer.nix
index 7121e30..c990c4e 100644
--- a/modules/software-templates/synapse-workers/stream-writers/presence-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/presence-stream-writer.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/push_rule-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/push_rule-stream-writer.nix
index 420c3b5..ad88faa 100644
--- a/modules/software-templates/synapse-workers/stream-writers/push_rule-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/push_rule-stream-writer.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/receipt-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/receipt-stream-writer.nix
index 53df3f6..f16ae3a 100644
--- a/modules/software-templates/synapse-workers/stream-writers/receipt-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/receipt-stream-writer.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/to_device-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/to_device-stream-writer.nix
index 8e1e613..4752170 100644
--- a/modules/software-templates/synapse-workers/stream-writers/to_device-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/to_device-stream-writer.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
diff --git a/modules/software-templates/synapse-workers/stream-writers/typing-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/typing-stream-writer.nix
index 9f57a3b..2f8fdaa 100644
--- a/modules/software-templates/synapse-workers/stream-writers/typing-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/typing-stream-writer.nix
@@ -82,6 +82,7 @@ in
name = "unix:/run/matrix-synapse/${workerName}-${type}-${toString index}.sock";
value = {
max_fails = 0;
+ fail_timeout = 0s;
};
}) workers
);
|
