From 2e59119a50be12196e8bd7541a257507401c79e6 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Sun, 12 Jan 2025 10:58:15 +0200 Subject: [PATCH 01/22] initial matrix/conduit stuff, i think? --- flake.lock | 742 ++++++++++++++++++++++++++++++-- flake.nix | 4 +- networking/firewall.mod.nix | 2 + services/caddy/Caddyfile | 4 + services/social/conduit.mod.nix | 24 ++ 5 files changed, 733 insertions(+), 43 deletions(-) create mode 100644 services/social/conduit.mod.nix diff --git a/flake.lock b/flake.lock index 6b80fed..ce070b4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1731270564, + "narHash": "sha256-6KMC/NH/VWP5Eb+hA56hz0urel3jP6Y6cF2PX6xaTkk=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "47752427561f1c34debb16728a210d378f0ece36", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -66,6 +90,202 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1733424942, + "narHash": "sha256-5t7Sl6EkOaoP4FvzLmH7HFDbdl9SizmLh53RjDQCbWQ=", + "owner": "cachix", + "repo": "cachix", + "rev": "8b6b0e4694b9aa78b2ea4c93bff6e1a222dc7e4a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": [ + "conduwuit", + "cachix", + "devenv" + ], + "flake-compat": [ + "conduwuit", + "cachix", + "devenv" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv" + ], + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1734303596, + "narHash": "sha256-HjDRyLR4MBqQ3IjfMM6eE+8ayztXlbz3gXdyDmFla68=", + "owner": "girlbossceo", + "repo": "complement", + "rev": "14cc5be797b774f1a2b9f826f38181066d4952b8", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_2", + "fenix": "fenix", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_5", + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1736435929, + "narHash": "sha256-VIszlm7sNpzmzgM8nisOezoaFOzRyR+WpsLaF2D3BbA=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "7526ba9d6fc4221a338056802f8456733da314d6", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "locked": { + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", + "owner": "ipetkov", + "repo": "crane", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ], + "nix": "nix", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733323168, + "narHash": "sha256-d5DwB4MZvlaQpN6OQ4SLYxb5jA4UH5EtV5t5WOtjLPU=", + "owner": "cachix", + "repo": "devenv", + "rev": "efa9010b8b1cfd5dd3c7ed1e172a470c3b84a064", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1735799625, + "narHash": "sha256-lFadwWDvVIub11bwfZhsh2WUByf9LOi6yjsSUMmE0xk=", + "owner": "nix-community", + "repo": "fenix", + "rev": "a9d84a1545814910cb4ab0515ed6921e8b07ee95", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -98,7 +318,121 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -119,9 +453,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -156,10 +490,39 @@ "git-hooks": { "inputs": { "flake-compat": [ - "stylix", + "conduwuit", + "cachix", "flake-compat" ], "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_2", "nixpkgs": [ "stylix", "nixpkgs" @@ -185,6 +548,29 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "stylix", @@ -264,6 +650,118 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1733603756, + "narHash": "sha256-eTKnZDZ1Ex++v+BI0DBcUBmCXAO/tE8hxK9MiyztZkU=", + "owner": "axboe", + "repo": "liburing", + "rev": "c3d5d6270cd5ed48d817fc1e8e95f7c8b222f2ff", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": [ + "conduwuit", + "cachix", + "devenv" + ], + "nixpkgs-regression": [ + "conduwuit", + "cachix", + "devenv" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv" + ] + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -286,7 +784,7 @@ }, "nix-monitored": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1733253839, @@ -318,6 +816,148 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1682134069, + "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1735685343, + "narHash": "sha256-h1CpBzdJDNtSUb5QMyfFHKHocTTky+4McgQEBQBM+xA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "81934660d6e9ea54d2f0cdee821e8533b10c221a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1732521221, "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", @@ -333,23 +973,7 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { + "nixpkgs_7": { "locked": { "lastModified": 1736344531, "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", @@ -365,7 +989,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_8": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -381,7 +1005,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_9": { "locked": { "lastModified": 1735648875, "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=", @@ -397,36 +1021,57 @@ "type": "github" } }, - "nixpkgs_5": { + "rocksdb": { + "flake": false, "locked": { - "lastModified": 1682134069, - "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "lastModified": 1734469478, + "narHash": "sha256-IcQ4N8xADYal79K+ONmNq4RLlIwdgUqgrVzgNgiIaG8=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "8b4808e7de2fbb5d119d8d72cdca76d8ab84bc47", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "girlbossceo", + "ref": "v9.9.3", + "repo": "rocksdb", + "type": "github" } }, "root": { "inputs": { + "conduwuit": "conduwuit", "home-manager": "home-manager", "nix-index-database": "nix-index-database", "nix-monitored": "nix-monitored", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_7", + "nixpkgs-stable": "nixpkgs-stable_3", "sops-nix": "sops-nix", "stylix": "stylix", "vscode-server": "vscode-server" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1735742096, + "narHash": "sha256-q3a80h8Jf8wfmPURUgRR46nQCB3I5fhZ+/swulTF5HY=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "7e639ee3dda6ed9cecc79d41f6d38235121e483d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1736515725, @@ -449,13 +1094,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "git-hooks": "git-hooks", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_2", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems", + "nixpkgs": "nixpkgs_9", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -505,6 +1150,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -573,8 +1233,8 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index 269c870..db142ec 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -21,7 +21,7 @@ vscode-server.url = "github:nix-community/nixos-vscode-server"; - #niri.url = "github:sodiboo/niri-flake"; + conduwuit.url = "github:girlbossceo/conduwuit"; }; outputs = { diff --git a/networking/firewall.mod.nix b/networking/firewall.mod.nix index 7541c82..be51344 100644 --- a/networking/firewall.mod.nix +++ b/networking/firewall.mod.nix @@ -37,6 +37,7 @@ 64738 # murmur tcp 6700 # grafana web 6750 # prometheus + 7893 # conduwuit ]; allowedUDPPorts = [ 64738 # murmur udp @@ -55,6 +56,7 @@ 80 # http 222 # forgejo ssh 443 # https + 8448 # matrix/conduit port, i think ? 64738 # murmur tcp ]; interfaces.eth0.allowedUDPPorts = [ diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index ef4c927..5f83941 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -55,4 +55,8 @@ https://grf.collective-conciousness.monster { reverse_proxy 10.24.1.4:6700 +} + +matrix.collective-conciousness.monter, matrix.collective-conciousness.monster:8448 { + reverse_proxy 10.24.1.4:7893 } \ No newline at end of file diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix new file mode 100644 index 0000000..092a5ab --- /dev/null +++ b/services/social/conduit.mod.nix @@ -0,0 +1,24 @@ +{conduwuit, ...}: { + glucose.modules = [ + ({ + lib, + config, + ... + }: { + services.matrix-conduit = { + enable = true; + package = conduwuit.packages.x86_64-linux.default; + settings.global = { + server_name = "collective-conciousness.monster"; + database_backend = "rocksdb"; + max_request_size = 1024 * 1024 * 1024; + address = "127.0.0.1"; + port = "7893"; + database_path = "/var/services/conduwuit/"; + }; + }; + + systemd.services.conduit.serviceConfig.ExecStart = lib.mkForce (lib.getExe config.services.matrix-conduit.package); # wrong in nixpkgs + }) + ]; +} \ No newline at end of file -- 2.47.0 From 094a819f4dfd94ae0bdb5e8c8ebf9d32cbb8b0d9 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 08:37:42 +0200 Subject: [PATCH 02/22] fix some errors, add some binary caches, the usual B) -e --- nix.mod.nix | 15 ++++++++++++++- services/social/conduit.mod.nix | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/nix.mod.nix b/nix.mod.nix index 325b3a7..bb36959 100644 --- a/nix.mod.nix +++ b/nix.mod.nix @@ -127,6 +127,12 @@ in { nix.settings.trusted-users = ["remote-builder"]; } ) + { + nix.settings = { + substituters = ["https://cache.nixos.org?priority=3"]; + trusted-public-keys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="]; + }; + } ( { config, @@ -140,11 +146,18 @@ in { ) { nix.settings = { - substituters = ["https://cache.collective-conciousness.monster"]; + substituters = ["https://cache.collective-conciousness.monster?priority=1"]; trusted-public-keys = ["adyya-flake:PAbC0hnAiNj/kHcm9wIykmKIf25FDeXB6JusqlX2ghs="]; }; } ) + { + nix.settings = { + # binary caches for conduwuit + substituters = ["https://attic.kennel.juneis.dog/conduit?priority=5" "https://attic.kennel.juneis.dog/conduwuit?priority=7"]; + trusted-public-keys = ["conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" "conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE="]; + }; + } ]; personal.modules = [ { diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix index 092a5ab..7cb740d 100644 --- a/services/social/conduit.mod.nix +++ b/services/social/conduit.mod.nix @@ -13,12 +13,12 @@ database_backend = "rocksdb"; max_request_size = 1024 * 1024 * 1024; address = "127.0.0.1"; - port = "7893"; - database_path = "/var/services/conduwuit/"; + port = 7893; + # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; systemd.services.conduit.serviceConfig.ExecStart = lib.mkForce (lib.getExe config.services.matrix-conduit.package); # wrong in nixpkgs }) ]; -} \ No newline at end of file +} -- 2.47.0 From eb5cb48c9ffeea328f12f810fa8851859d811e7d Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 14:45:16 +0200 Subject: [PATCH 03/22] ooh there's a separate conduwuit package --- networking/firewall.mod.nix | 3 ++- services/social/conduit.mod.nix | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/networking/firewall.mod.nix b/networking/firewall.mod.nix index be51344..9ae4b3a 100644 --- a/networking/firewall.mod.nix +++ b/networking/firewall.mod.nix @@ -43,6 +43,7 @@ 64738 # murmur udp 6700 # grafana web 6750 # prometheus data ap + 7893 ]; }; } @@ -56,7 +57,7 @@ 80 # http 222 # forgejo ssh 443 # https - 8448 # matrix/conduit port, i think ? + 8448 # matrix/conduwuit port, i think ? 64738 # murmur tcp ]; interfaces.eth0.allowedUDPPorts = [ diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix index 7cb740d..9bb987d 100644 --- a/services/social/conduit.mod.nix +++ b/services/social/conduit.mod.nix @@ -5,12 +5,11 @@ config, ... }: { - services.matrix-conduit = { + services.conduwuit = { enable = true; package = conduwuit.packages.x86_64-linux.default; settings.global = { - server_name = "collective-conciousness.monster"; - database_backend = "rocksdb"; + server_name = "noösphere"; max_request_size = 1024 * 1024 * 1024; address = "127.0.0.1"; port = 7893; -- 2.47.0 From 90ab187a15a18dc58404ea64bd6fdc0ba5c8eb2e Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 14:48:04 +0200 Subject: [PATCH 04/22] type error --- services/social/conduit.mod.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix index 9bb987d..f6accec 100644 --- a/services/social/conduit.mod.nix +++ b/services/social/conduit.mod.nix @@ -11,13 +11,11 @@ settings.global = { server_name = "noösphere"; max_request_size = 1024 * 1024 * 1024; - address = "127.0.0.1"; + address = ["127.0.0.1"]; port = 7893; # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; - - systemd.services.conduit.serviceConfig.ExecStart = lib.mkForce (lib.getExe config.services.matrix-conduit.package); # wrong in nixpkgs }) ]; } -- 2.47.0 From 95c7651fe93fa7b10cfbc58ac01279ef1af5f50a Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 14:49:04 +0200 Subject: [PATCH 05/22] fuck,, another type error --- services/social/conduit.mod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix index f6accec..056d237 100644 --- a/services/social/conduit.mod.nix +++ b/services/social/conduit.mod.nix @@ -12,7 +12,7 @@ server_name = "noösphere"; max_request_size = 1024 * 1024 * 1024; address = ["127.0.0.1"]; - port = 7893; + port = [7893]; # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; -- 2.47.0 From 2b7f9fc73f3955cef5b5a935b82809cd10e4694b Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 14:51:27 +0200 Subject: [PATCH 06/22] fuck me, i guess --- services/social/conduit.mod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix index 056d237..5374c94 100644 --- a/services/social/conduit.mod.nix +++ b/services/social/conduit.mod.nix @@ -9,7 +9,7 @@ enable = true; package = conduwuit.packages.x86_64-linux.default; settings.global = { - server_name = "noösphere"; + server_name = "noosphere"; max_request_size = 1024 * 1024 * 1024; address = ["127.0.0.1"]; port = [7893]; -- 2.47.0 From dbf6ef98d3b34a98b72b4d23c61bd696a6e74ea4 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 14:52:04 +0200 Subject: [PATCH 07/22] fuck me with hammers --- services/social/conduit.mod.nix | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 services/social/conduit.mod.nix diff --git a/services/social/conduit.mod.nix b/services/social/conduit.mod.nix deleted file mode 100644 index 5374c94..0000000 --- a/services/social/conduit.mod.nix +++ /dev/null @@ -1,21 +0,0 @@ -{conduwuit, ...}: { - glucose.modules = [ - ({ - lib, - config, - ... - }: { - services.conduwuit = { - enable = true; - package = conduwuit.packages.x86_64-linux.default; - settings.global = { - server_name = "noosphere"; - max_request_size = 1024 * 1024 * 1024; - address = ["127.0.0.1"]; - port = [7893]; - # database_path = lib.mkForce "/var/services/conduwuit/"; - }; - }; - }) - ]; -} -- 2.47.0 From 72cc84f1dcdcdf69f611aefbce613593dc5dce7c Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 14:52:33 +0200 Subject: [PATCH 08/22] git rename blunder --- services/social/conduwuit.mod.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 services/social/conduwuit.mod.nix diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix new file mode 100644 index 0000000..e14b963 --- /dev/null +++ b/services/social/conduwuit.mod.nix @@ -0,0 +1,21 @@ +{conduwuit, ...}: { + glucose.modules = [ + ({ + lib, + config, + ... + }: { + services.conduwuit = { + enable = true; + package = conduwuit.packages.x86_64-linux.default; + settings.global = { + server_name = "collective-conciousness.monster"; + max_request_size = 1024 * 1024 * 1024; + address = ["127.0.0.1"]; + port = [7893]; + # database_path = lib.mkForce "/var/services/conduwuit/"; + }; + }; + }) + ]; +} -- 2.47.0 From adbd18e34da32f2c42f35be7123a8b54996fc22a Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 15:06:07 +0200 Subject: [PATCH 09/22] something weird is going on, try this? --- services/social/conduwuit.mod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix index e14b963..64ffd03 100644 --- a/services/social/conduwuit.mod.nix +++ b/services/social/conduwuit.mod.nix @@ -11,7 +11,7 @@ settings.global = { server_name = "collective-conciousness.monster"; max_request_size = 1024 * 1024 * 1024; - address = ["127.0.0.1"]; + #address = ["127.0.0.1"]; port = [7893]; # database_path = lib.mkForce "/var/services/conduwuit/"; }; -- 2.47.0 From f4e7a44e64a325b0f16254fec80d3a032b1fabbe Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 15:08:46 +0200 Subject: [PATCH 10/22] try this? --- services/social/conduwuit.mod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix index 64ffd03..be5ef94 100644 --- a/services/social/conduwuit.mod.nix +++ b/services/social/conduwuit.mod.nix @@ -12,7 +12,7 @@ server_name = "collective-conciousness.monster"; max_request_size = 1024 * 1024 * 1024; #address = ["127.0.0.1"]; - port = [7893]; + port = [8448]; # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; -- 2.47.0 From ec10b73ded8e95c1a0bb2753603ca78a2febd706 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 15:10:34 +0200 Subject: [PATCH 11/22] open firewall properly? --- networking/firewall.mod.nix | 4 ++-- services/caddy/Caddyfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/networking/firewall.mod.nix b/networking/firewall.mod.nix index 9ae4b3a..784418b 100644 --- a/networking/firewall.mod.nix +++ b/networking/firewall.mod.nix @@ -37,13 +37,13 @@ 64738 # murmur tcp 6700 # grafana web 6750 # prometheus - 7893 # conduwuit + 8448 # matrix/conduwuit ]; allowedUDPPorts = [ 64738 # murmur udp 6700 # grafana web 6750 # prometheus data ap - 7893 + 8448 # matrix/conduwuit ]; }; } diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 5f83941..1bdc38d 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -58,5 +58,5 @@ https://grf.collective-conciousness.monster { } matrix.collective-conciousness.monter, matrix.collective-conciousness.monster:8448 { - reverse_proxy 10.24.1.4:7893 + reverse_proxy 10.24.1.4:8448 } \ No newline at end of file -- 2.47.0 From 2fb7fd9f6ccdb9a609a50dc021d2d47116164f5c Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 15:13:04 +0200 Subject: [PATCH 12/22] something strange is afoot --- networking/firewall.mod.nix | 4 ++-- services/caddy/Caddyfile | 2 +- services/social/conduwuit.mod.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/networking/firewall.mod.nix b/networking/firewall.mod.nix index 784418b..674eb8d 100644 --- a/networking/firewall.mod.nix +++ b/networking/firewall.mod.nix @@ -37,13 +37,13 @@ 64738 # murmur tcp 6700 # grafana web 6750 # prometheus - 8448 # matrix/conduwuit + 7893 # matrix/conduwuit ]; allowedUDPPorts = [ 64738 # murmur udp 6700 # grafana web 6750 # prometheus data ap - 8448 # matrix/conduwuit + 7893 # matrix/conduwuit ]; }; } diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 1bdc38d..5f83941 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -58,5 +58,5 @@ https://grf.collective-conciousness.monster { } matrix.collective-conciousness.monter, matrix.collective-conciousness.monster:8448 { - reverse_proxy 10.24.1.4:8448 + reverse_proxy 10.24.1.4:7893 } \ No newline at end of file diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix index be5ef94..64ffd03 100644 --- a/services/social/conduwuit.mod.nix +++ b/services/social/conduwuit.mod.nix @@ -12,7 +12,7 @@ server_name = "collective-conciousness.monster"; max_request_size = 1024 * 1024 * 1024; #address = ["127.0.0.1"]; - port = [8448]; + port = [7893]; # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; -- 2.47.0 From 3bc33b75994eed4f7851a5adc246dd695f94a65d Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 15:22:32 +0200 Subject: [PATCH 13/22] if it's this i will be slightly annoyed --- services/social/conduwuit.mod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix index 64ffd03..8b523f9 100644 --- a/services/social/conduwuit.mod.nix +++ b/services/social/conduwuit.mod.nix @@ -11,7 +11,7 @@ settings.global = { server_name = "collective-conciousness.monster"; max_request_size = 1024 * 1024 * 1024; - #address = ["127.0.0.1"]; + address = ["0.0.0.0"]; port = [7893]; # database_path = lib.mkForce "/var/services/conduwuit/"; }; -- 2.47.0 From d7557053a43cf7301e57d86284b325971738205a Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 15:25:56 +0200 Subject: [PATCH 14/22] it uh works now. also touched up the Caddyfile a bit. --- services/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 5f83941..263f814 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -57,6 +57,6 @@ https://grf.collective-conciousness.monster { } -matrix.collective-conciousness.monter, matrix.collective-conciousness.monster:8448 { +http://matrix.collective-conciousness.monter, https://matrix.collective-conciousness.monster, matrix.collective-conciousness.monster, matrix.collective-conciousness.monster:8448 { reverse_proxy 10.24.1.4:7893 } \ No newline at end of file -- 2.47.0 From cc857fdab393d3222add411e364af724cf2273eb Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:22:49 +0200 Subject: [PATCH 15/22] i think matrix well-known is like hell --- apps.mod.nix | 1 + services/caddy/Caddyfile | 11 +++++++++-- services/social/conduwuit.mod.nix | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apps.mod.nix b/apps.mod.nix index 5cd2b82..d757bb5 100644 --- a/apps.mod.nix +++ b/apps.mod.nix @@ -54,6 +54,7 @@ vlc signal-desktop discord + element-desktop obsidian mumble # calibre # still borked apparently, what the hell # still!!! diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 263f814..9703705 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -14,11 +14,18 @@ } } -https://collective-conciousness.monster { +https://collective-conciousness.monster, http://collective-conciousness.monster { encode zstd gzip header { Strict-Transport-Security "max-age=31536001; includeSubdomains; preload" } + #reverse_proxy /_matrix* 10.24.1.4:6167 + +# respond /.well-known* { +# body {"m.server":"extreme-mediumvolu.me:443"} +# close +# } + root * /var/www/public file_server { precompressed zstd br gzip @@ -57,6 +64,6 @@ https://grf.collective-conciousness.monster { } -http://matrix.collective-conciousness.monter, https://matrix.collective-conciousness.monster, matrix.collective-conciousness.monster, matrix.collective-conciousness.monster:8448 { +http://matrix.collective-conciousness.monster, https://matrix.collective-conciousness.monster, matrix.collective-conciousness.monster, matrix.collective-conciousness.monster:8448, collective-conciousness.monster:8448 { reverse_proxy 10.24.1.4:7893 } \ No newline at end of file diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix index 8b523f9..230c8aa 100644 --- a/services/social/conduwuit.mod.nix +++ b/services/social/conduwuit.mod.nix @@ -13,6 +13,10 @@ max_request_size = 1024 * 1024 * 1024; address = ["0.0.0.0"]; port = [7893]; + well-known = { + client = "https://matrix.collective-conciousness.monster"; + server = "collective-conciousness.monster:8448"; + }; # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; -- 2.47.0 From b4bb6666ac1a73e0e4088531c0bb97538bcb8f6b Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:22:54 +0200 Subject: [PATCH 16/22] oop --- services/social/conduwuit.mod.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/social/conduwuit.mod.nix b/services/social/conduwuit.mod.nix index 230c8aa..d3b0044 100644 --- a/services/social/conduwuit.mod.nix +++ b/services/social/conduwuit.mod.nix @@ -13,10 +13,11 @@ max_request_size = 1024 * 1024 * 1024; address = ["0.0.0.0"]; port = [7893]; - well-known = { + /* well-known = { client = "https://matrix.collective-conciousness.monster"; server = "collective-conciousness.monster:8448"; }; + */ # database_path = lib.mkForce "/var/services/conduwuit/"; }; }; -- 2.47.0 From 16b425894e445224cc36c0e8928f4f455248b5f1 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:29:33 +0200 Subject: [PATCH 17/22] freaky shit with the matrix well-known --- services/caddy/Caddyfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 9703705..2d91b0d 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -19,7 +19,8 @@ https://collective-conciousness.monster, http://collective-conciousness.monster header { Strict-Transport-Security "max-age=31536001; includeSubdomains; preload" } - #reverse_proxy /_matrix* 10.24.1.4:6167 + + reverse_proxy /_matrix*,/.well-known/matrix* 10.24.1.4:7893 # respond /.well-known* { # body {"m.server":"extreme-mediumvolu.me:443"} -- 2.47.0 From 38063d062d8e60f9a97cc315c06d9db620f70773 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:35:26 +0200 Subject: [PATCH 18/22] urgh --- services/caddy/Caddyfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 2d91b0d..1f68a56 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -20,7 +20,8 @@ https://collective-conciousness.monster, http://collective-conciousness.monster Strict-Transport-Security "max-age=31536001; includeSubdomains; preload" } - reverse_proxy /_matrix*,/.well-known/matrix* 10.24.1.4:7893 + reverse_proxy /_matrix* 10.24.1.4:7893 + reverse_proxy /.well-known/matrix* 10.24.1.4:7893 # respond /.well-known* { # body {"m.server":"extreme-mediumvolu.me:443"} -- 2.47.0 From 3da156a1465242cb90514b46aa32c5f2acda6923 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:46:11 +0200 Subject: [PATCH 19/22] try using a static response ffor matrix??? --- services/caddy/Caddyfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 1f68a56..2806fcf 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -21,13 +21,10 @@ https://collective-conciousness.monster, http://collective-conciousness.monster } reverse_proxy /_matrix* 10.24.1.4:7893 - reverse_proxy /.well-known/matrix* 10.24.1.4:7893 - -# respond /.well-known* { -# body {"m.server":"extreme-mediumvolu.me:443"} -# close -# } - + respond /.well-known/matrix/server { + body {"m.server": "collective-conciousness.monster:443"} + close + } root * /var/www/public file_server { precompressed zstd br gzip -- 2.47.0 From 22befa5a0d9c601d93944ef79627bca33bdd8b06 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:50:28 +0200 Subject: [PATCH 20/22] i guess i forgot to escape my quotes --- services/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 2806fcf..369a6f9 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -22,7 +22,7 @@ https://collective-conciousness.monster, http://collective-conciousness.monster reverse_proxy /_matrix* 10.24.1.4:7893 respond /.well-known/matrix/server { - body {"m.server": "collective-conciousness.monster:443"} + body "{\"m.server\": \"collective-conciousness.monster:443\"}" close } root * /var/www/public -- 2.47.0 From 0d7b387a9598c35f3ca2ee8e2feac043a84884a2 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:55:37 +0200 Subject: [PATCH 21/22] format Caddyfile properly and try to fix the fucking static response hello please ,, --- services/caddy/Caddyfile | 87 +++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 369a6f9..e357de7 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -1,68 +1,65 @@ { - layer4 { - :222 { - @a ssh - route @a { - proxy 10.24.1.9:222 - } - } - :64738 { - route { - proxy 10.24.1.4:64738 - } - } - } + layer4 { + :222 { + @a ssh + route @a { + proxy 10.24.1.9:222 + } + } + :64738 { + route { + proxy 10.24.1.4:64738 + } + } + } } https://collective-conciousness.monster, http://collective-conciousness.monster { - encode zstd gzip - header { - Strict-Transport-Security "max-age=31536001; includeSubdomains; preload" - } + encode zstd gzip + header { + Strict-Transport-Security "max-age=31536001; includeSubdomains; preload" + } - reverse_proxy /_matrix* 10.24.1.4:7893 - respond /.well-known/matrix/server { - body "{\"m.server\": \"collective-conciousness.monster:443\"}" - close - } - root * /var/www/public - file_server { - precompressed zstd br gzip - } + reverse_proxy /_matrix* 10.24.1.4:7893 + respond /.well-known/matrix/server "{\"m.server\": \"collective-conciousness.monster:443\"}" + + root * /var/www/public + file_server { + precompressed zstd br gzip + } } https://git.collective-conciousness.monster { - reverse_proxy 10.24.1.9:3000 + reverse_proxy 10.24.1.9:3000 } -https://obs.collective-conciousness.monster { - reverse_proxy 10.24.1.4:5894 +https://obs.collective-conciousness.monster { + reverse_proxy 10.24.1.4:5894 } https://gts.collective-conciousness.monster { - # Optional, but recommended, compress the traffic using proper protocols - encode zstd gzip + # Optional, but recommended, compress the traffic using proper protocols + encode zstd gzip - # The actual proxy configuration to port 8080 (unless you've chosen another port number) - reverse_proxy 10.24.1.9:8080 { - # Flush immediately, to prevent buffered response to the client - flush_interval -1 - } + # The actual proxy configuration to port 8080 (unless you've chosen another port number) + reverse_proxy 10.24.1.9:8080 { + # Flush immediately, to prevent buffered response to the client + flush_interval -1 + } } -https://cache.collective-conciousness.monster { - encode zstd gzip - - reverse_proxy 10.24.1.4:5020 +https://cache.collective-conciousness.monster { + encode zstd gzip + + reverse_proxy 10.24.1.4:5020 } https://grf.collective-conciousness.monster { - encode zstd gzip - - reverse_proxy 10.24.1.4:6700 + encode zstd gzip + reverse_proxy 10.24.1.4:6700 } http://matrix.collective-conciousness.monster, https://matrix.collective-conciousness.monster, matrix.collective-conciousness.monster, matrix.collective-conciousness.monster:8448, collective-conciousness.monster:8448 { - reverse_proxy 10.24.1.4:7893 -} \ No newline at end of file + reverse_proxy 10.24.1.4:7893 +} -- 2.47.0 From 538a64868cc2cd2740fa56d849ce5b9224635c29 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Mon, 13 Jan 2025 18:59:37 +0200 Subject: [PATCH 22/22] world's most fuc,kign innatentive catgirl?>??? --- services/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index e357de7..9b3fdca 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -21,7 +21,7 @@ https://collective-conciousness.monster, http://collective-conciousness.monster } reverse_proxy /_matrix* 10.24.1.4:7893 - respond /.well-known/matrix/server "{\"m.server\": \"collective-conciousness.monster:443\"}" + respond /.well-known/matrix/server "{\"m.server\": \"matrix.collective-conciousness.monster:443\"}" root * /var/www/public file_server { -- 2.47.0