From ee88a04c29789475400a61feaa0c2a8c449b3d76 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Thu, 17 Nov 2022 15:51:03 +0000
Subject: [PATCH 1/2] Fix version that `worker_main_http_uri` is redundant from

---
 docs/workers.md           | 4 ++--
 synapse/config/workers.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/workers.md b/docs/workers.md
index 46046508037d..27e54c584637 100644
--- a/docs/workers.md
+++ b/docs/workers.md
@@ -135,8 +135,8 @@ In the config file for each worker, you must specify:
    [`worker_replication_http_port`](usage/configuration/config_documentation.md#worker_replication_http_port)).
  * If handling HTTP requests, a [`worker_listeners`](usage/configuration/config_documentation.md#worker_listeners) option
    with an `http` listener.
- * **Synapse 1.71 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for
-   the main process (`worker_main_http_uri`). This config option is no longer required and is ignored when running Synapse 1.72 and newer.
+ * **Synapse 1.72 and older:** if handling the `^/_matrix/client/v3/keys/upload` endpoint, the HTTP URI for
+   the main process (`worker_main_http_uri`). This config option is no longer required and is ignored when running Synapse 1.73 and newer.
 
 For example:
 
diff --git a/synapse/config/workers.py b/synapse/config/workers.py
index c4e2273a9520..913b83e1745b 100644
--- a/synapse/config/workers.py
+++ b/synapse/config/workers.py
@@ -166,7 +166,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
         self.worker_main_http_uri = config.get("worker_main_http_uri", None)
         if self.worker_main_http_uri is not None:
             logger.warning(
-                "The config option worker_main_http_uri is unused since Synapse 1.72. "
+                "The config option worker_main_http_uri is unused since Synapse 1.73. "
                 "It can be safely removed from your configuration."
             )
 

From 6747acbe831dadbbfb62d59cac6ac8d40b8874ec Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Thu, 17 Nov 2022 15:52:26 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/14476.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/14476.misc

diff --git a/changelog.d/14476.misc b/changelog.d/14476.misc
new file mode 100644
index 000000000000..6e025329c4e5
--- /dev/null
+++ b/changelog.d/14476.misc
@@ -0,0 +1 @@
+Remove the `worker_main_http_uri` configuration setting. This is now handled via internal replication.