summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2025-10-27 23:12:41 +0000
committerRory& <root@rory.gay>2025-10-28 00:10:24 +0000
commita4b065619eba3dc840957bbd8edad35b8b1e8195 (patch)
treea0095a963f715611598e43b79705087e9a250651
parentUpdate synapse patches to 1.140 (diff)
downloadRory-Open-Architecture-a4b065619eba3dc840957bbd8edad35b8b1e8195.tar.xz
server/synapse updates
-rw-r--r--flake.lock82
-rwxr-xr-xflake.nix2
-rw-r--r--host/Rory-ovh/services/email/nginx.nix28
-rwxr-xr-xhost/Rory-ovh/services/matrix/synapse/synapse-main.nix6
4 files changed, 59 insertions, 59 deletions
diff --git a/flake.lock b/flake.lock

index 71304ea..e8bb57e 100644 --- a/flake.lock +++ b/flake.lock
@@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1758843686, - "narHash": "sha256-lFV92hOV9jXv+v8GQGtfcUbBT9FuUmEmyXaYQX4vpGw=", + "lastModified": 1760825413, + "narHash": "sha256-FERt8IG3ILmqOb46YZPqzoPQkmxEk6UHjjXQQjExUWQ=", "owner": "unmojang", "repo": "drasl", - "rev": "0034c4174ac13caa66188e496c6bfc0ceb8ccd3b", + "rev": "9655dfb5e0c8fbec3e6e4189a382016a0718cc8f", "type": "github" }, "original": { @@ -238,11 +238,11 @@ "draupnirSrc": { "flake": false, "locked": { - "lastModified": 1760098044, - "narHash": "sha256-ZzwZg7sevX0qKnlZ4snCcwSejWqA6JHCx3e6vWucO8U=", + "lastModified": 1760365474, + "narHash": "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=", "owner": "the-draupnir-project", "repo": "Draupnir", - "rev": "61a0210cd198b0162196094d47470bd3596825b4", + "rev": "cb86d6d0cd4c7a529cfbdefbf8e607630a6b6662", "type": "github" }, "original": { @@ -582,11 +582,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1760295538, - "narHash": "sha256-SgnrSgyWj2ezIftKRpf+C6AdYqTkXN4iJA+JRQtdjrk=", + "lastModified": 1761584077, + "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=", "owner": "nix-community", "repo": "home-manager", - "rev": "904fa32d77609f281ef32d5209926d81848b687a", + "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef", "type": "github" }, "original": { @@ -882,11 +882,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1760292753, - "narHash": "sha256-UDXkh/LOK4Qs+HUgSLOz2+JZ+YCSmtbEIqSSIKigm1I=", - "rev": "e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb", + "lastModified": 1761581267, + "narHash": "sha256-/bKYOXEodgpnj9UHSFc6qOhSWoKc/XNZYksnZijqkgg=", + "rev": "73c019c57b902043c57a7b15f5682ef34ffdcd2b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb.tar.gz?rev=e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/73c019c57b902043c57a7b15f5682ef34ffdcd2b.tar.gz?rev=73c019c57b902043c57a7b15f5682ef34ffdcd2b" }, "original": { "type": "tarball", @@ -905,11 +905,11 @@ ] }, "locked": { - "lastModified": 1756511062, - "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", - "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", + "lastModified": 1759851320, + "narHash": "sha256-n5dRAIC3/78drQtFxmQRrBLd6TKfotUnX7GWu0mAcSg=", + "rev": "7c31a18259b8358ac196cf803a26967c0fa1d3e4", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz?rev=3f09a5eb772e02d98bb8878ab687d5b721f00d16" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/7c31a18259b8358ac196cf803a26967c0fa1d3e4.tar.gz?rev=7c31a18259b8358ac196cf803a26967c0fa1d3e4" }, "original": { "type": "tarball", @@ -919,11 +919,11 @@ "matrixSpecSrc": { "flake": false, "locked": { - "lastModified": 1759937564, - "narHash": "sha256-Dxmn+K/IRvlofqJbM/EDD2GoNFhyZEMSzOGxkEUgjKM=", + "lastModified": 1761301159, + "narHash": "sha256-T4NHwHxasuyfFDUOZF+bBE67jAmwCl5vDKqLeTCkkoM=", "owner": "matrix-org", "repo": "matrix-spec", - "rev": "fda3be5ee3a10b53dddcd33672112d7c7067622b", + "rev": "74a0d5f289c0db13108596f8436b35f0c9bea05a", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1760298340, - "narHash": "sha256-3oW0TLCtoHw0LMjn3lsGDYc5JlsMK6ScoVtpBXOoWjA=", + "lastModified": 1761583645, + "narHash": "sha256-YquXS0bfdVVJ2voO+IOPrMkgKGQAI/7Vrakv+UwRZBI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "815f6e9e3ece723a0b0c1593bc78cf980755b9d4", + "rev": "a0ae3bbb074ff8bdcd23c57645347631906be3a8", "type": "github" }, "original": { @@ -1076,11 +1076,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1760298340, - "narHash": "sha256-3oW0TLCtoHw0LMjn3lsGDYc5JlsMK6ScoVtpBXOoWjA=", + "lastModified": 1761583645, + "narHash": "sha256-YquXS0bfdVVJ2voO+IOPrMkgKGQAI/7Vrakv+UwRZBI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "815f6e9e3ece723a0b0c1593bc78cf980755b9d4", + "rev": "a0ae3bbb074ff8bdcd23c57645347631906be3a8", "type": "github" }, "original": { @@ -1140,11 +1140,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1759994382, - "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -1156,11 +1156,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1760164275, - "narHash": "sha256-gKl2Gtro/LNf8P+4L3S2RsZ0G390ccd5MyXYrTdMCFE=", + "lastModified": 1760596604, + "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "362791944032cb532aabbeed7887a441496d5e6e", + "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", "type": "github" }, "original": { @@ -1236,11 +1236,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -1268,11 +1268,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -1422,11 +1422,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1760240450, - "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", + "lastModified": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix
index dc0e743..b6dce49 100755 --- a/flake.nix +++ b/flake.nix
@@ -426,7 +426,7 @@ inherit (oldAttrs) src; inherit patches; name = "${oldAttrs.pname}-${oldAttrs.version}"; - hash = "sha256-PUwSg//1xAMyv0HOMt4YFR680fQ+7YAcSJ0vmlPyCzQ="; + hash = "sha256-XJj1S2dJVQCj2hq09pdb/+06tIWjaecdolf36yeugUg="; }; }); diff --git a/host/Rory-ovh/services/email/nginx.nix b/host/Rory-ovh/services/email/nginx.nix
index 0553294..2b3bc04 100644 --- a/host/Rory-ovh/services/email/nginx.nix +++ b/host/Rory-ovh/services/email/nginx.nix
@@ -1,20 +1,20 @@ { config, lib, ... }: { services.nginx.virtualHosts = { - "mta-sts.rory.gay" = { - enableACME = !config.virtualisation.isVmVariant; - forceSSL = !config.virtualisation.isVmVariant; - locations = { - "/.well-known/mta-sts.txt" = { - # age 604800 - return = lib.replaceString "\n" "\\n" '' - 200 "version: STSv1 - mode: enforce - max_age: 120 - mx: mail.rory.gay"''; - }; - }; - }; +# "mta-sts.rory.gay" = { +# enableACME = !config.virtualisation.isVmVariant; +# forceSSL = !config.virtualisation.isVmVariant; +# locations = { +# "/.well-known/mta-sts.txt" = { +# # age 604800 +# return = lib.replaceString "\n" "\\n" '' +# 200 "version: STSv1 +# mode: enforce +# max_age: 120 +# mx: mail.rory.gay"''; +# }; +# }; +# }; "mail.rory.gay" = { enableACME = !config.virtualisation.isVmVariant; forceSSL = !config.virtualisation.isVmVariant; diff --git a/host/Rory-ovh/services/matrix/synapse/synapse-main.nix b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
index 86e1348..16bd6b0 100755 --- a/host/Rory-ovh/services/matrix/synapse/synapse-main.nix +++ b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
@@ -35,9 +35,9 @@ toDeviceStreamWriters = 1; typingStreamWriters = 1; - plugins = with pkgs.matrix-synapse-plugins; [ - synapse-http-antispam - ]; + #plugins = with pkgs.matrix-synapse-plugins; [ + # synapse-http-antispam + #]; #untested: #sharedStreamWriters = 1;