diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-07 17:35:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-07 17:35:28 +0100 |
| commit | f942980c0b5ee18ab49a27870aedb4b8302efe4c (patch) | |
| tree | 46e0999fa3099fd46e88eb930d00065ddf71515f /synapse/config/homeserver.py | |
| parent | Merge pull request #706 from matrix-org/markjh/slaveIV (diff) | |
| parent | Add myself to AUTHORS.rst (diff) | |
| download | synapse-f942980c0b5ee18ab49a27870aedb4b8302efe4c.tar.xz | |
Merge pull request #701 from DoubleMalt/ldap-auth
Add LDAP authentication
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 3 |
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 |