summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorChristoph Witzany <christoph@web.crofting.com>2016-04-05 17:26:37 +0200
committerChristoph Witzany <christoph@web.crofting.com>2016-04-06 18:23:45 +0200
commit3d95405e5fe4ef1b795dbfd63a3532cac65b8cd4 (patch)
tree8af4ede163017465eb5781159f66c31f8afaf9e4 /synapse/config/homeserver.py
parentMerge pull request #702 from matrix-org/markjh/slaveII (diff)
downloadsynapse-3d95405e5fe4ef1b795dbfd63a3532cac65b8cd4.tar.xz
Introduce LDAP authentication
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 acf74c8761..9a80ac39ec 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -30,13 +30,14 @@ from .saml2 import SAML2Config
 from .cas import CasConfig
 from .password import PasswordConfig
 from .jwt import JWTConfig
+from .ldap import LDAPConfig
 
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
                        RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
                        VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig,
                        AppServiceConfig, KeyConfig, SAML2Config, CasConfig,
-                       JWTConfig, PasswordConfig,):
+                       JWTConfig, LDAPConfig, PasswordConfig,):
     pass