From 666a2b0a8a7941768077a7774d6ca7732d8e8c24 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 26 Aug 2023 08:36:05 +0200
Subject: l matrix: remove deprecated pkg override

---
 lass/2configs/matrix.nix | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'lass/2configs/matrix.nix')

diff --git a/lass/2configs/matrix.nix b/lass/2configs/matrix.nix
index cdcbe7ab0..1d6a8663e 100644
--- a/lass/2configs/matrix.nix
+++ b/lass/2configs/matrix.nix
@@ -2,24 +2,6 @@
 with import <stockholm/lib>;
 {
   services.matrix-synapse = {
-    # synapse 1.60.0 errors during startup with:
-    # https://github.com/matrix-org/synapse/issues/15809
-    package = pkgs.matrix-synapse.overrideAttrs (oldAttrs: rec {
-      version = "1.85.2";
-      name = "matrix-synapse-${version}";
-      src = pkgs.fetchFromGitHub {
-        owner = "matrix-org";
-        repo = "synapse";
-        rev = "v${version}";
-        hash = "sha256-pFafBsisBPfpDnFYWcimUuBgfFVPZzLna3yHeqIBAAE=";
-      };
-      cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
-        inherit src;
-        name = "matrix-synapse-${version}";
-        hash = "sha256-dnno+5Ma0YNYpmj3oZ5UG22uAanKwVT67BwQW+mHoFc=";
-      };
-      doCheck = false;
-    });
     enable = true;
     settings = {
       server_name = "lassul.us";
-- 
cgit v1.2.3


From 3ad34380669da711fb857a8dcc971d3abd5975a0 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 3 Sep 2023 12:07:17 +0200
Subject: l matrix: add compression

---
 lass/2configs/matrix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/matrix.nix')

diff --git a/lass/2configs/matrix.nix b/lass/2configs/matrix.nix
index 1d6a8663e..7c4b645f2 100644
--- a/lass/2configs/matrix.nix
+++ b/lass/2configs/matrix.nix
@@ -25,7 +25,7 @@ with import <stockholm/lib>;
             }
             {
               names = [ "federation" ];
-              compress = false;
+              compress = true;
             }
           ];
         }
-- 
cgit v1.2.3


From f55307fd73af235069744dd5155fda0bc73fe613 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 7 Sep 2023 12:26:31 +0200
Subject: lass: migrate away

---
 lass/2configs/matrix.nix | 62 ------------------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 lass/2configs/matrix.nix

(limited to 'lass/2configs/matrix.nix')

diff --git a/lass/2configs/matrix.nix b/lass/2configs/matrix.nix
deleted file mode 100644
index 7c4b645f2..000000000
--- a/lass/2configs/matrix.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-{
-  services.matrix-synapse = {
-    enable = true;
-    settings = {
-      server_name = "lassul.us";
-      # registration_shared_secret = "yolo";
-      database.name = "sqlite3";
-      turn_uris  = [
-        "turn:turn.matrix.org?transport=udp"
-        "turn:turn.matrix.org?transport=tcp"
-      ];
-      listeners = [
-        {
-          port = 8008;
-          bind_addresses = [ "::1" ];
-          type = "http";
-          tls = false;
-          x_forwarded = true;
-          resources = [
-            {
-              names = [ "client" ];
-              compress = true;
-            }
-            {
-              names = [ "federation" ];
-              compress = true;
-            }
-          ];
-        }
-      ];
-    };
-  };
-  services.nginx = {
-    virtualHosts = {
-      "lassul.us" = {
-        locations."= /.well-known/matrix/server".extraConfig = ''
-          add_header Content-Type application/json;
-          return 200 '${builtins.toJSON {
-            "m.server" = "matrix.lassul.us:443";
-          }}';
-        '';
-        locations."= /.well-known/matrix/client".extraConfig = ''
-          add_header Content-Type application/json;
-          add_header Access-Control-Allow-Origin *;
-          return 200 '${builtins.toJSON {
-            "m.homeserver" = { "base_url" = "https://matrix.lassul.us"; };
-            "m.identity_server" = { "base_url" = "https://vector.im"; };
-          }}';
-        '';
-      };
-      "matrix.lassul.us" = {
-        forceSSL = true;
-        enableACME = true;
-        locations."/_matrix" = {
-          proxyPass = "http://[::1]:8008";
-        };
-      };
-    };
-  };
-}
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/fd000000.lock: No such file or directory (2)