diff options
| -rw-r--r-- | flake.lock | 90 | ||||
| -rwxr-xr-x | flake.nix | 8 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/matrix/synapse.nix | 2 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/nginx/rory.gay/conduit.nix | 3 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/postgres.nix | 2 |
5 files changed, 61 insertions, 44 deletions
diff --git a/flake.lock b/flake.lock index b6b4e0c..433f4c8 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1714472853, - "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", "owner": "matrix-org", "repo": "complement", - "rev": "891d18872c153d39a9ce63b545045efddb845738", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", "type": "github" }, "original": { @@ -90,21 +90,21 @@ "fenix": "fenix", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", + "liburing": "liburing", "nix-filter": "nix-filter", "nixpkgs": "nixpkgs_3", "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1714626305, - "narHash": "sha256-1fCNA5OWYBIow3pcyDJzj4HEiHMsxHNpr0sNZqU+2Gc=", + "lastModified": 1716800097, + "narHash": "sha256-A8AXq7GqwLNOwCP6UyHzrusf2he6IYlD363/SrBKgts=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "42ba2584ab5f2cfcc1952b484903177c94c686c7", + "rev": "6ccf578437a42cf8f32a454ca99b78df23cfa4dc", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "dev", "repo": "conduwuit", "type": "github" } @@ -120,15 +120,16 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1714631281, - "narHash": "sha256-dn7/DnlZrRFvdj/Qr2U1nHPmjwFyn+APooDUgTvMYy4=", + "lastModified": 1714919298, + "narHash": "sha256-3LhH1e2HuGWkhHfYXtiqLS0OUIxoJAxLvKOfkZ7iDus=", "owner": "famedly", "repo": "conduit", - "rev": "622aa574b6eecc127af2193e93dab1000c4f4838", + "rev": "d8badaf64bd29735b80d1a0652b9073a74866c55", "type": "gitlab" }, "original": { "owner": "famedly", + "ref": "membership-reason-fixes", "repo": "conduit", "type": "gitlab" } @@ -163,11 +164,11 @@ ] }, "locked": { - "lastModified": 1713738183, - "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", + "lastModified": 1716156051, + "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", "owner": "ipetkov", "repo": "crane", - "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", + "rev": "7443df1c478947bf96a2e699209f53b2db26209d", "type": "github" }, "original": { @@ -230,11 +231,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "lastModified": 1716272846, + "narHash": "sha256-MtL0YhG20cngHsS6PIdpA3bkLnSx6XJBd2V8R9RaEc4=", "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "063d7e5fac454edd35b7e2cedb6ca9fb1410c79b", "type": "github" }, "original": { @@ -451,6 +452,23 @@ "type": "github" } }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1716398759, + "narHash": "sha256-fDlOR13WmwVgMxGUMQXWSZAoy2VhZ5AfZRPF9qmQjSc=", + "owner": "axboe", + "repo": "liburing", + "rev": "49be3cad491ae8b3c40348b8d78ae2b0d3726b78", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, "mtxclientSrc": { "flake": false, "locked": { @@ -570,18 +588,14 @@ }, "nixpkgs-rory": { "locked": { - "lastModified": 1714857654, - "narHash": "sha256-lHLhAap5HklB1yQhUldJNjnFX6AVuKpEsYHtaYin9nc=", - "owner": "TheArcaneBrony", - "repo": "nixpkgs", - "rev": "5f577ce369c55b5774fd7a766693d705a31391e4", - "type": "github" + "lastModified": 0, + "narHash": "sha256-WxnpAK+t4gqM/o0AylZbAZH24qmLBWHXcOS/XPCWlcY=", + "path": "/Rory-Open-Architecture/nixpkgs", + "type": "path" }, "original": { - "owner": "TheArcaneBrony", - "ref": "master", - "repo": "nixpkgs", - "type": "github" + "path": "/Rory-Open-Architecture/nixpkgs", + "type": "path" } }, "nixpkgs-stable": { @@ -634,11 +648,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -731,16 +745,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1713810944, - "narHash": "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=", - "owner": "facebook", + "lastModified": 1716773462, + "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", + "owner": "girlbossceo", "repo": "rocksdb", - "rev": "6f7cabeac80a3a6150be2c8a8369fcecb107bf43", + "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", "type": "github" }, "original": { - "owner": "facebook", - "ref": "v9.1.1", + "owner": "girlbossceo", + "ref": "v9.2.1", "repo": "rocksdb", "type": "github" } @@ -762,11 +776,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713628977, - "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=", + "lastModified": 1716107283, + "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "55d9a533b309119c8acd13061581b43ae8840823", + "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 30f4826..40bb8b3 100755 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,8 @@ #url="path:/Rory-Open-Architecture/nixpkgs"; }; nixpkgs-rory = { - #url = "path:/Rory-Open-Architecture/nixpkgs"; - url = "github:TheArcaneBrony/nixpkgs/master"; + url = "path:/Rory-Open-Architecture/nixpkgs"; + #url = "github:TheArcaneBrony/nixpkgs/master"; }; nixpkgs-RoryNix = { #url = "github:NixOS/nixpkgs/nixos-23.05"; @@ -21,14 +21,14 @@ #url = "gitlab:famedly/conduit"; #url = "github:girlbossceo/conduwuit/7ecc570bb8a07aba9802fd0217f978583f55bc8b"; - url = "github:girlbossceo/conduwuit/dev"; + url = "github:girlbossceo/conduwuit"; # Assuming you have an input for nixpkgs called `nixpkgs`. If you experience # build failures while using this, try commenting/deleting this line. This # will probably also require you to always build from source. #inputs.nixpkgs.follows = "nixpkgs"; }; conduit-vanilla = { - url = "gitlab:famedly/conduit"; + url = "gitlab:famedly/conduit/membership-reason-fixes"; }; nixos-wsl.url = "github:nix-community/NixOS-WSL"; #inputs.nur.url = github:nix-community/NUR; diff --git a/host/Rory-nginx/services/matrix/synapse.nix b/host/Rory-nginx/services/matrix/synapse.nix index c1109aa..9e7c2a2 100755 --- a/host/Rory-nginx/services/matrix/synapse.nix +++ b/host/Rory-nginx/services/matrix/synapse.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - federationSenders = lib.range 0 63; + federationSenders = lib.range 0 31; federationReceivers = lib.range 10000 10000; initialSyncWorkers = lib.range 10100 10100; syncWorkers = lib.range 10150 10150; diff --git a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix index 81547aa..32087c3 100755 --- a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix @@ -23,6 +23,9 @@ ''; }; #locations."/_synapse/client".proxyPass = "http://192.168.1.5:8008"; + locations."/_conduwuit/".extraConfig = '' + return 404; + ''; locations."= /.well-known/matrix/server".extraConfig = '' more_set_headers 'Content-Type application/json'; diff --git a/host/Rory-nginx/services/postgres.nix b/host/Rory-nginx/services/postgres.nix index 7ac3619..ac3b228 100755 --- a/host/Rory-nginx/services/postgres.nix +++ b/host/Rory-nginx/services/postgres.nix @@ -24,7 +24,7 @@ dataDir = "/mnt/postgres/data"; settings = { # https://pgconfigurator.cybertec.at/ - max_connections = 250; + max_connections = 2500; superuser_reserved_connections = 3; shared_buffers = "32565MB"; |