summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-05 17:58:06 -0700
committerKegan Dougal <kegan@matrix.org>2014-09-05 17:58:06 -0700
commit0b9e1e7b562c3b278873060ca3c4109bc2e451e8 (patch)
tree9b20a68e0ecb72acbfd963ad2510eec3387ac3c6 /synapse/config/homeserver.py
parentAdded webclient config.js for storing recaptcha public key. (diff)
downloadsynapse-0b9e1e7b562c3b278873060ca3c4109bc2e451e8.tar.xz
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 76e2cdeddd..e16f2c733b 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -19,9 +19,10 @@ from .logger import LoggingConfig
 from .database import DatabaseConfig
 from .ratelimiting import RatelimitConfig
 from .repository import ContentRepositoryConfig
+from .captcha import CaptchaConfig
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
-                       RatelimitConfig, ContentRepositoryConfig):
+                       RatelimitConfig, ContentRepositoryConfig, CaptchaConfig):
     pass
 
 if __name__=='__main__':