diff --git a/packages/overlays/matrix-synapse/patches/0002-Allow-rooms-admin-API-to-be-on-workers-18360.patch b/packages/overlays/matrix-synapse/patches/0002-Allow-rooms-admin-API-to-be-on-workers-18360.patch
deleted file mode 100644
index 7cb9bd1..0000000
--- a/packages/overlays/matrix-synapse/patches/0002-Allow-rooms-admin-API-to-be-on-workers-18360.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 5b89c9264380da8f9cc55460f8215758fe570010 Mon Sep 17 00:00:00 2001
-From: Erik Johnston <erikj@element.io>
-Date: Fri, 25 Apr 2025 15:18:22 +0100
-Subject: [PATCH 02/74] Allow /rooms/ admin API to be on workers (#18360)
-
-Tested by https://github.com/matrix-org/sytest/pull/1400
----
- changelog.d/18360.misc | 1 +
- docs/workers.md | 1 +
- synapse/app/generic_worker.py | 3 ++-
- synapse/rest/admin/__init__.py | 5 +++--
- 4 files changed, 7 insertions(+), 3 deletions(-)
- create mode 100644 changelog.d/18360.misc
-
-diff --git a/changelog.d/18360.misc b/changelog.d/18360.misc
-new file mode 100644
-index 0000000000..e5bf4f536f
---- /dev/null
-+++ b/changelog.d/18360.misc
-@@ -0,0 +1 @@
-+Allow `/rooms/` admin API to be run on workers.
-diff --git a/docs/workers.md b/docs/workers.md
-index def902d24c..9ebcc886b1 100644
---- a/docs/workers.md
-+++ b/docs/workers.md
-@@ -249,6 +249,7 @@ information.
- ^/_matrix/client/(api/v1|r0|v3|unstable)/directory/room/.*$
- ^/_matrix/client/(r0|v3|unstable)/capabilities$
- ^/_matrix/client/(r0|v3|unstable)/notifications$
-+ ^/_synapse/admin/v1/rooms/
-
- # Encryption requests
- ^/_matrix/client/(r0|v3|unstable)/keys/query$
-diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
-index a528c3890d..e4120ed424 100644
---- a/synapse/app/generic_worker.py
-+++ b/synapse/app/generic_worker.py
-@@ -52,7 +52,7 @@ from synapse.logging.context import LoggingContext
- from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy
- from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource
- from synapse.rest import ClientRestResource
--from synapse.rest.admin import register_servlets_for_media_repo
-+from synapse.rest.admin import AdminRestResource, register_servlets_for_media_repo
- from synapse.rest.health import HealthResource
- from synapse.rest.key.v2 import KeyResource
- from synapse.rest.synapse.client import build_synapse_client_resource_tree
-@@ -190,6 +190,7 @@ class GenericWorkerServer(HomeServer):
-
- resources.update(build_synapse_client_resource_tree(self))
- resources["/.well-known"] = well_known_resource(self)
-+ resources["/_synapse/admin"] = AdminRestResource(self)
-
- elif name == "federation":
- resources[FEDERATION_PREFIX] = TransportLayerServer(self)
-diff --git a/synapse/rest/admin/__init__.py b/synapse/rest/admin/__init__.py
-index f3c99663e8..5977ded4a0 100644
---- a/synapse/rest/admin/__init__.py
-+++ b/synapse/rest/admin/__init__.py
-@@ -275,7 +275,9 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
- """
- Register all the admin servlets.
- """
-- # Admin servlets aren't registered on workers.
-+ RoomRestServlet(hs).register(http_server)
-+
-+ # Admin servlets below may not work on workers.
- if hs.config.worker.worker_app is not None:
- return
-
-@@ -283,7 +285,6 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
- BlockRoomRestServlet(hs).register(http_server)
- ListRoomRestServlet(hs).register(http_server)
- RoomStateRestServlet(hs).register(http_server)
-- RoomRestServlet(hs).register(http_server)
- RoomRestV2Servlet(hs).register(http_server)
- RoomMembersRestServlet(hs).register(http_server)
- DeleteRoomStatusByDeleteIdRestServlet(hs).register(http_server)
---
-2.49.0
-
|
