summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory&::Emma <root@rory.gay>2025-01-17 16:40:01 +0000
committerRory&::Emma <root@rory.gay>2025-01-17 16:40:07 +0000
commitb0e5fb33aab260bdca52377b4a7dbed094b3aaf5 (patch)
tree24de2ccfa1af8567a99c24a24fb57dc5060acc63
parentAdd arci (diff)
downloadRory-Open-Architecture-b0e5fb33aab260bdca52377b4a7dbed094b3aaf5.tar.xz
Server updates & changes
-rw-r--r--flake.lock42
-rwxr-xr-xhost/Rory-nginx/configuration.nix2
-rwxr-xr-xhost/Rory-nginx/services/containers/matrixunittests/services/conduit.nix9
3 files changed, 24 insertions, 29 deletions
diff --git a/flake.lock b/flake.lock

index 6d1c506..46dc4d4 100644 --- a/flake.lock +++ b/flake.lock
@@ -176,11 +176,11 @@ "draupnirSrc": { "flake": false, "locked": { - "lastModified": 1736638672, - "narHash": "sha256-Vj8DHSLc/T9z5hmdfaVOKqV3TWLE2ScQt/HfEn9ciZo=", + "lastModified": 1737054547, + "narHash": "sha256-G2CPjGwVDFJZbZt56tbzP0Pj2kkDWOVtlKGqWLN2qwQ=", "owner": "the-draupnir-project", "repo": "Draupnir", - "rev": "9d80b44871642f8c831a90cb35a055fd7bb16075", + "rev": "a16fb7b2c0c1c6ac66a4adfcd1865606a62478b4", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1737120639, + "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "nhekoSrc": { "flake": false, "locked": { - "lastModified": 1736468156, - "narHash": "sha256-Cf6l1399jQQpQPwwAji31DlO5fSVIuNXiMALPptrdf4=", + "lastModified": 1736985431, + "narHash": "sha256-QJLxRAQCblEBm+kxVx7YrvXa9bhxnZ9vEPvCoKs1bZU=", "owner": "Nheko-reborn", "repo": "nheko", - "rev": "5fe8ebf335add0c90f2db6c23f165d4edd63691c", + "rev": "101934b2ba457cdceb61cf474a91698846877da1", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixpkgs-Draupnir": { "locked": { - "lastModified": 1736456248, - "narHash": "sha256-7ne2LL62xfwcKnvoWpbr902w8bCHjLvt3SsOFIeZX+A=", + "lastModified": 1737055669, + "narHash": "sha256-+FedazFJ4nRxSdBEZfLoMRaqD8zPCu0rcg5igfzH94Y=", "owner": "TheArcaneBrony", "repo": "nixpkgs", - "rev": "945b6ee0970f8b8b52a17f5cd97d5c68f110cb07", + "rev": "2fbc40b920c295f3e181efd9128405b4b1070164", "type": "github" }, "original": { @@ -695,11 +695,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1736772414, - "narHash": "sha256-anPYbIV+R8j6Nhgcb9ncTB8ndtuhXWZKg7zKR4BqM0k=", + "lastModified": 1737131676, + "narHash": "sha256-sGMDX92I+RNwqRfIxOSmWJM4zcTsHC//ZXopLgDrcdI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8d482a8fb4676422833dfa3bcc59c9af4c55b3a", + "rev": "123138b3cca3177b014a787f3b407994e13c97ee", "type": "github" }, "original": { @@ -871,11 +871,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1736515725, - "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", + "lastModified": 1737107480, + "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", + "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "type": "github" }, "original": { diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index b874e14..961f7da 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix
@@ -83,7 +83,7 @@ # conduit = grapevine; #}; - #containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib grapevine; }; + containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib grapevine; }; # #containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix { # inherit pkgs lib; diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
index 39f588a..e066557 100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
@@ -6,13 +6,7 @@ enable = true; settings = { server_name = "matrixunittests.rory.gay"; - enable_lightning_bolt = true; - max_concurrent_requests = 1000; allow_registration = true; - yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true; - #allow_guest_registration = true; -# disable_federation = true; - listen = [ { @@ -21,6 +15,7 @@ port = 6167; } ]; + server_discovery.client.base_url = "https://matrixunittests.rory.gay"; # This is required for some reason database = { backend = "rocksdb"; @@ -44,4 +39,4 @@ Restart = "on-failure"; }; }; -} \ No newline at end of file +}