From accd2145769ab996694a10f5b0fd860ab6f95515 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 30 Mar 2025 09:08:18 +0200
Subject: [PATCH] bundles/matrix-synapse: remove sliding sync

---
 bundles/matrix-synapse/items.py    | 29 -----------------------------
 bundles/matrix-synapse/metadata.py | 12 ------------
 nodes/carlene.toml                 |  4 ----
 3 files changed, 45 deletions(-)

diff --git a/bundles/matrix-synapse/items.py b/bundles/matrix-synapse/items.py
index 47a9758..527cc5e 100644
--- a/bundles/matrix-synapse/items.py
+++ b/bundles/matrix-synapse/items.py
@@ -57,32 +57,3 @@ svc_systemd = {
         },
     },
 }
-
-if node.metadata.get('matrix-synapse/sliding_sync/version', None):
-    files['/usr/local/bin/matrix-sliding-sync'] = {
-        'content_type': 'download',
-        'source': 'https://github.com/matrix-org/sliding-sync/releases/download/{}/syncv3_linux_amd64'.format(
-            node.metadata.get('matrix-synapse/sliding_sync/version'),
-        ),
-        'content_hash': node.metadata.get('matrix-synapse/sliding_sync/sha1', None),
-        'mode': '0755',
-        'triggers': {
-            'svc_systemd:matrix-sliding-sync:restart',
-        },
-    }
-
-    files['/usr/local/lib/systemd/system/matrix-sliding-sync.service'] = {
-        'content_type': 'mako',
-        'triggers': {
-            'action:systemd-reload',
-            'svc_systemd:matrix-sliding-sync:restart',
-        },
-    }
-
-    svc_systemd['matrix-sliding-sync'] = {
-        'needs': {
-            'file:/usr/local/bin/matrix-sliding-sync',
-            'file:/usr/local/lib/systemd/system/matrix-sliding-sync.service',
-            'postgres_db:synapse',
-        },
-    }
diff --git a/bundles/matrix-synapse/metadata.py b/bundles/matrix-synapse/metadata.py
index 7af43f0..eac3005 100644
--- a/bundles/matrix-synapse/metadata.py
+++ b/bundles/matrix-synapse/metadata.py
@@ -88,14 +88,6 @@ def nginx(metadata):
     if not node.has_bundle('nginx'):
         raise DoNotRunAgain
 
-    wellknown_client_sliding_sync = {}
-    if metadata.get('matrix-synapse/sliding_sync/version', None):
-        wellknown_client_sliding_sync = {
-            'org.matrix.msc3575.proxy': {
-                'url': 'https://{}'.format(metadata.get('matrix-synapse/baseurl')),
-            },
-        }
-
     wellknown = {
         '/.well-known/matrix/client': {
             'content': dumps({
@@ -105,7 +97,6 @@ def nginx(metadata):
                 'm.identity_server': {
                     'base_url': metadata.get('matrix-synapse/identity_server', 'https://matrix.org'),
                 },
-                **wellknown_client_sliding_sync,
                 **metadata.get('matrix-synapse/additional_client_config', {}),
             }, sort_keys=True),
             'return': 200,
@@ -134,9 +125,6 @@ def nginx(metadata):
             'target': 'http://[::1]:20080',
             'max_body_size': '50M',
         },
-        '/_matrix/client/unstable/org.matrix.msc3575/sync': {
-            'target': 'http://127.0.0.1:20070',
-        },
         '/_synapse': {
             'target': 'http://[::1]:20080',
         },
diff --git a/nodes/carlene.toml b/nodes/carlene.toml
index d936789..0aae01f 100644
--- a/nodes/carlene.toml
+++ b/nodes/carlene.toml
@@ -81,10 +81,6 @@ server_name = "franzi.business"
 trusted_key_servers = ["matrix.org", "161.rocks"]
 additional_client_config.'im.vector.riot.jitsi'.preferredDomain = "meet.ffmuc.net"
 wellknown_also_on_vhosts = ["franzi.business"]
-[metadata.matrix-synapse.sliding_sync]
-version = "v0.99.15"
-sha1 = "cecb371ff5f1dd528cfc490484a0967dcc28cd82"
-secret = "!decrypt:encrypt$gAAAAABl9yJlbEZafJ2mumtg03rW0-440NIgFcgdWGMo3Axrypugwctacy9Cq7MYtCBGjnDyNvVLI5B2QMJ9ssCD46NCsFRN3-X4u9rDtxPhRZV7rls_LQ_Csc_GsffJfvpmHbn_wsljd3I74h4ouWlYhhEQUIKwb3eErSZ_VTZhu_bC4jTa0FY="
 
 [metadata.mautrix-telegram]
 version = "v0.15.2"