From 2c288d5ea310736a9b6088c7f04e42517b5b12a3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 25 Feb 2022 14:29:49 +0100
Subject: surtr: ma1sd: remove

---
 hosts/surtr/dns/zones/li.synapse.soa |  3 +--
 hosts/surtr/matrix/default.nix       | 34 ----------------------------------
 hosts/surtr/postgresql.nix           |  5 -----
 3 files changed, 1 insertion(+), 41 deletions(-)

(limited to 'hosts')

diff --git a/hosts/surtr/dns/zones/li.synapse.soa b/hosts/surtr/dns/zones/li.synapse.soa
index 50c341a7..1a7c57ea 100644
--- a/hosts/surtr/dns/zones/li.synapse.soa
+++ b/hosts/surtr/dns/zones/li.synapse.soa
@@ -1,7 +1,7 @@
 $ORIGIN synapse.li.
 $TTL 3600
 @ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
-  2022022502 ; serial
+  2022022503 ; serial
   10800      ; refresh
   3600       ; retry
   604800     ; expire
@@ -22,7 +22,6 @@ $TTL 3600
 @                       IN      TXT     "v=spf1 redirect=yggdrasil.li"
 
 _matrix._tcp		IN	SRV	5 0 443 synapse.li.
-_matrix-identity._tcp   IN      SRV     5 0 443 synapse.li.
 
 element			IN	CNAME	synapse.li.
 _acme-challenge.element	IN	NS	ns.yggdrasil.li.
diff --git a/hosts/surtr/matrix/default.nix b/hosts/surtr/matrix/default.nix
index b07f9fe2..53b0bdc4 100644
--- a/hosts/surtr/matrix/default.nix
+++ b/hosts/surtr/matrix/default.nix
@@ -38,9 +38,6 @@
         "/run/credentials/matrix-synapse.service/registration.yaml"
         "/run/credentials/matrix-synapse.service/turn-secret.yaml"
       ];
-      extraConfig = ''
-        default_identity_server: https://synapse.li
-      '';
     };
     sops.secrets."matrix-synapse-registration.yaml" = {
       format = "binary";
@@ -243,36 +240,5 @@
       owner = "turnserver";
       group = "turnserver";
     };
-
-    services.mxisd = {
-      enable = true;
-      matrix.domain = "synapse.li";
-      server = {
-        name = "localhost";
-        port = 8090;
-      };
-      extraConfig = {
-        matrix = {
-          v1 = true;
-          v2 = true;
-        };
-        hashing = {
-          enabled = true;
-          rotationPolicy = "per_requests";
-          hashStorageType = "sql";
-          algorithms = ["sha256"];
-          requests = 10;
-        };
-        server.publicUrl = "https://synapse.li";
-        storage = {
-          backend = "postgresql";
-          provider.postgresql = {
-            database = "//file%3A%2F%2F%2Frun%2Fpostgresql%2F.s.PGSQL.5432/mxisd?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory%24URIScheme";
-          };
-        };
-        forward.servers = ["matrix-org"];
-        invite.resolution.recursive = false;
-      };
-    };
   };
 }
diff --git a/hosts/surtr/postgresql.nix b/hosts/surtr/postgresql.nix
index e622f4e9..a34bc675 100644
--- a/hosts/surtr/postgresql.nix
+++ b/hosts/surtr/postgresql.nix
@@ -9,11 +9,6 @@
         CREATE USER "matrix-synapse";
         GRANT ALL PRIVILEGES ON DATABASE "matrix-synapse" TO "matrix-synapse";
         GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "matrix-synapse";
-
-        CREATE DATABASE "mxisd" WITH TEMPLATE "template0" ENCODING "UTF8" LOCALE "C";
-        CREATE USER "mxisd";
-        GRANT ALL PRIVILEGES ON DATABASE "mxisd" TO "mxisd";
-        GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "mxisd";
       '';
     };
   };
-- 
cgit v1.2.3