1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/server.py b/synapse/server.py
index fe94836a2c..f1078a3805 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -174,6 +174,7 @@ class HomeServer(object):
         "event_builder_factory",
         "filtering",
         "http_client_context_factory",
+        "proxied_http_client",
         "simple_http_client",
         "proxied_http_client",
         "media_repository",
@@ -212,6 +213,7 @@ class HomeServer(object):
         "replication_streamer",
         "replication_data_handler",
         "replication_streams",
+        "password_policy_handler",
     ]
 
     REQUIRED_ON_MASTER_STARTUP = ["user_directory_handler", "stats_handler"]
@@ -232,6 +234,8 @@ class HomeServer(object):
 
         self._reactor = reactor
         self.hostname = hostname
+        # the key we use to sign events and requests
+        self.signing_key = config.key.signing_key[0]
         self.config = config
         self._building = {}
         self._listening_services = []
@@ -570,9 +574,6 @@ class HomeServer(object):
     def build_event_client_serializer(self):
         return EventClientSerializer(self)
 
-    def build_password_policy_handler(self):
-        return PasswordPolicyHandler(self)
-
     def build_storage(self) -> Storage:
         return Storage(self, self.datastores)
 
@@ -585,6 +586,9 @@ class HomeServer(object):
     def build_replication_streams(self):
         return {stream.NAME: stream(self) for stream in STREAMS_MAP.values()}
 
+    def build_password_policy_handler(self):
+        return PasswordPolicyHandler(self)
+
     def remove_pusher(self, app_id, push_key, user_id):
         return self.get_pusherpool().remove_pusher(app_id, push_key, user_id)