diff options
| -rw-r--r-- | flake.lock | 61 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/matrix/draupnir.nix | 5 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/nginx/nginx.nix | 2 |
3 files changed, 39 insertions, 29 deletions
diff --git a/flake.lock b/flake.lock index 6c4af5d..b0dab21 100644 --- a/flake.lock +++ b/flake.lock @@ -87,15 +87,16 @@ "complement": { "flake": false, "locked": { - "lastModified": 1713458251, - "narHash": "sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s=", + "lastModified": 1714472853, + "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", "owner": "matrix-org", "repo": "complement", - "rev": "d73c81a091604b0fc5b6b0617dcac58c25763f57", + "rev": "891d18872c153d39a9ce63b545045efddb845738", "type": "github" }, "original": { "owner": "matrix-org", + "ref": "main", "repo": "complement", "type": "github" } @@ -113,11 +114,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1714324689, - "narHash": "sha256-MIWKtsDmTGqpWx5epbtMspKWeucPRZY26vpuRlqc0SI=", + "lastModified": 1714626305, + "narHash": "sha256-1fCNA5OWYBIow3pcyDJzj4HEiHMsxHNpr0sNZqU+2Gc=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "70f533662046f5025d39d2a084d2832b59d47c26", + "rev": "42ba2584ab5f2cfcc1952b484903177c94c686c7", "type": "github" }, "original": { @@ -138,11 +139,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1714307305, - "narHash": "sha256-GzTtQ3Oqr5gBek0TJCczDolWpc7KJCTFmkufb3FhECk=", + "lastModified": 1714631281, + "narHash": "sha256-dn7/DnlZrRFvdj/Qr2U1nHPmjwFyn+APooDUgTvMYy4=", "owner": "famedly", "repo": "conduit", - "rev": "10412d4be9de894b831b2f4cccc6f6b366d3fc15", + "rev": "622aa574b6eecc127af2193e93dab1000c4f4838", "type": "gitlab" }, "original": { @@ -248,15 +249,16 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713680591, - "narHash": "sha256-3pbv7UgAgetwz9YdjzIT/lZ6Rgj6wj6MR4mphBLyDjU=", + "lastModified": 1714544767, + "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", "owner": "nix-community", "repo": "fenix", - "rev": "19aaa94a73cc670a4d87e84f0909966cd8f8cd79", + "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", "type": "github" }, "original": { "owner": "nix-community", + "ref": "main", "repo": "fenix", "type": "github" } @@ -311,6 +313,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -410,6 +413,7 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } @@ -470,11 +474,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1714203603, - "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", + "lastModified": 1714515075, + "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", + "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "type": "github" }, "original": { @@ -529,6 +533,7 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "nix-filter", "type": "github" } @@ -555,11 +560,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1714134704, - "narHash": "sha256-jgTn20s3qzar/IqhjQcEO+dIQbT4hBFIloVntiCURkA=", + "lastModified": 1714355896, + "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c", + "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", "type": "github" }, "original": { @@ -586,11 +591,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1714272655, - "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=", + "lastModified": 1714531828, + "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf", + "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", "type": "github" }, "original": { @@ -603,7 +608,7 @@ "nixpkgs-rory": { "locked": { "lastModified": 0, - "narHash": "sha256-CGcusZqXJPnAgyGjrEQVptpI3S1tsNCsmn2mQDqQQYQ=", + "narHash": "sha256-0h4yzifkBwp7AtFBW62wtJmFrZW12Ge9SeyL6AWIV7M=", "path": "/Rory-Open-Architecture/nixpkgs", "type": "path" }, @@ -726,11 +731,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -742,11 +747,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", + "lastModified": 1714272655, + "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", + "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf", "type": "github" }, "original": { diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix index 8930f1e..12d258a 100755 --- a/host/Rory-nginx/services/matrix/draupnir.nix +++ b/host/Rory-nginx/services/matrix/draupnir.nix @@ -24,7 +24,9 @@ backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit pollReports = false; # this is a single person homeserver... let's save ourself the work - + + #homeserverUrl = "yes"; + admin.enableMakeRoomAdminCommand = true; commands.ban.defaultReasons = [ "spam" @@ -39,6 +41,7 @@ "faggot" "ywnbaw" "nigger" + "ioawejfioanwfoiawnfionf23iofn23ion312ion231ion12oi4n23io4n23io4" ]; minutesBeforeTrusting = 0; }; diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix index 74a99d2..91340c7 100755 --- a/host/Rory-nginx/services/nginx/nginx.nix +++ b/host/Rory-nginx/services/nginx/nginx.nix @@ -22,6 +22,8 @@ appendHttpConfig = '' #sendfile on; disable_symlinks off; + log_format combined_vhosts '$remote_addr - $remote_user [$time_local] {host="$host",server_name="$server_name"} "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"'; + access_log /var/log/nginx/access.log combined_vhosts; ''; upstreams = import ./matrix-upstreams.nix; additionalModules = with pkgs.nginxModules; [ |