From d3004d383369873f7a549ee407bde5df5a8cc634 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Thu, 29 Aug 2024 23:24:08 +0800
Subject: [PATCH] blacksteel: drop matrix-sliding-sync

---
 hosts/blacksteel/Caddyfile           |  7 -------
 hosts/blacksteel/default.nix         |  4 ----
 hosts/blacksteel/secrets.yaml        |  8 +++-----
 hosts/blacksteel/services/matrix.nix | 14 --------------
 hosts/tyo0/matrix-client.json        |  3 ---
 5 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/hosts/blacksteel/Caddyfile b/hosts/blacksteel/Caddyfile
index d165061..8c921e3 100644
--- a/hosts/blacksteel/Caddyfile
+++ b/hosts/blacksteel/Caddyfile
@@ -57,10 +57,3 @@ http://matrix.ny4.dev:80 {
 		header_up X-Forwarded-Proto "https"
 	}
 }
-
-http://syncv3.ny4.dev:80 {
-	import default
-	reverse_proxy unix//run/matrix-sliding-sync/sync.sock {
-		header_up X-Forwarded-Proto "https"
-	}
-}
diff --git a/hosts/blacksteel/default.nix b/hosts/blacksteel/default.nix
index 4976695..f8ab7f9 100644
--- a/hosts/blacksteel/default.nix
+++ b/hosts/blacksteel/default.nix
@@ -37,9 +37,6 @@
       restartUnits = [ "matrix-synapse.service" ];
       owner = config.systemd.services.matrix-synapse.serviceConfig.User;
     };
-    "syncv3/environment" = {
-      restartUnits = [ "matrix-sliding-sync.service" ];
-    };
     "mastodon/environment" = {
       restartUnits = [ "mastodon-web.service" ];
     };
@@ -64,7 +61,6 @@
         ingress = lib.genAttrs [
           "mastodon.ny4.dev"
           "matrix.ny4.dev"
-          "syncv3.ny4.dev"
         ] (_: "http://localhost");
       };
     };
diff --git a/hosts/blacksteel/secrets.yaml b/hosts/blacksteel/secrets.yaml
index d2516e0..2cd6413 100644
--- a/hosts/blacksteel/secrets.yaml
+++ b/hosts/blacksteel/secrets.yaml
@@ -1,8 +1,6 @@
 synapse:
     secret: ENC[AES256_GCM,data:H7bHbreE4NmpqXHpkPQ5AkwGOAs97YcQhQZIr5zgK1mgHMTGSbMP57elWMyMAQ3+wCy7x9Jx0H2omrdQh39iG32XoVyyMMoVMQ0OCgFa4O77DHdgG+wrWl7VLWNY,iv:cFbMEqJQG482ShZlpoxRhk7z/y5216WucXfJbkMxuxU=,tag:7iUyMlu2yStLLdkC/V9/DQ==,type:str]
     oidc: ENC[AES256_GCM,data:ihiMcrrYvPrNDJ13p6/FbINgh5wxv2vyOYxg0sthipM=,iv:+aESWZLI7/4HWjV7QT94py+zGLbTl+VoSsWdiGNHkjU=,tag:yxxZeDOtzFegCQGQT2HCgA==,type:str]
-syncv3:
-    environment: ENC[AES256_GCM,data:xVBXP3+w38T700OYu6XL1R1I0NWzcKeORWk5GE2lkWS+kooplcQb/wbov40H+DB522cRzCRutMXmrvGVWO86kIH/jT5tq5iWrdxbSKjTxA==,iv:6rtSdSMYtGnZl8WMmqxaCxbDG7SXhKy0LCXJJkorTvU=,tag:3PE5R31oU3ClL7elK/ca0g==,type:str]
 mastodon:
     environment: ENC[AES256_GCM,data:9RjpYXbGo8lBsXKg71Vbp2iTJlvXEGhn8hTl37o8G1E28JWF5Io7+evfqUv+N7QfSk1zbA==,iv:ejfe7f941QB7iiREXx1T9Vej43cW/S9nr03P5lkw9Yg=,tag:odI7xsxoPGBrxd0GnCsnOg==,type:str]
 cloudflared:
@@ -31,8 +29,8 @@ sops:
             bGQ1cytGR09Dd2JoaU5CSW1DL1FVR0kK8F2DoJcnd+T+eQ9h39DtaAGCSpS4wXVJ
             hOZBh9fDeue1PwMWufDJ6KGeR0atPbUjn2w0dquvLEdBjt3Un9rFcA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-21T07:19:43Z"
-    mac: ENC[AES256_GCM,data:pKWUM3uhmtrwTOlR2jZauWsGSY1d//z+cojpWLFAAKedGjotLB6cmektyAVRHhw3waiM4WR5+BNZ6ghp7qBrM0z2WanJCdSmXqdyxJEydUC9CCFXZG+7SmIZS+7+/LsqejzdYSAMf9DijN74E1EJVS5F0mHhw8QuRmDy3wU789M=,iv:IrOm1Maz8os9Q/ez+TbOxOTr1zwB1loDVHcPbN8kMvg=,tag:AAKp3OH/s2c7u8lp6vkLVg==,type:str]
+    lastmodified: "2024-08-29T15:23:52Z"
+    mac: ENC[AES256_GCM,data:32DW8e/ojxJzL8UOAQ3x8jg5fbUC+m+mwom00gXBaBsu/C2CLkOC2xyiZragBjbp/OWy3xoZC3GG7dngXpBT8pSo7T/F8KDnP2fKacvrKJRNBTT+JFjxZ0VkPy82MIi2JBkXqYRF248ofdXHFTHp/71s15R97xVtHEZdtGbEly0=,iv:sMgk1pTVWdgjSlXNvX4EAraw4tNwP1mxzihCv/dSfuI=,tag:FhfSoy5w2WezE++2QGjFrg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0
diff --git a/hosts/blacksteel/services/matrix.nix b/hosts/blacksteel/services/matrix.nix
index 24082ed..c573905 100644
--- a/hosts/blacksteel/services/matrix.nix
+++ b/hosts/blacksteel/services/matrix.nix
@@ -58,18 +58,4 @@
     environment = config.networking.proxy.envVars;
     serviceConfig.RuntimeDirectory = [ "matrix-synapse" ];
   };
-
-  services.matrix-sliding-sync = {
-    enable = true;
-    environmentFile = config.sops.secrets."syncv3/environment".path;
-    settings = {
-      SYNCV3_SERVER = "/run/matrix-synapse/synapse.sock";
-      SYNCV3_BINDADDR = "/run/matrix-sliding-sync/sync.sock";
-    };
-  };
-
-  systemd.services.matrix-sliding-sync.serviceConfig = {
-    RuntimeDirectory = [ "matrix-sliding-sync" ];
-    SupplementaryGroups = [ "matrix-synapse" ];
-  };
 }
diff --git a/hosts/tyo0/matrix-client.json b/hosts/tyo0/matrix-client.json
index 6cb0dd7..95e65fc 100644
--- a/hosts/tyo0/matrix-client.json
+++ b/hosts/tyo0/matrix-client.json
@@ -2,7 +2,4 @@
   "m.homeserver": {
     "base_url": "https://matrix.ny4.dev"
   },
-  "org.matrix.msc3575.proxy": {
-    "url": "https://syncv3.ny4.dev"
-  }
 }