diff options
| author | Erik Johnston <erikj@jki.re> | 2016-10-12 11:41:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 11:41:20 +0100 |
| commit | 35e2cc8b5278e5db31920392741ac7ff22b3ee24 (patch) | |
| tree | 5772b8b48fa388db060f9a776f6222dd36a8037d /synapse/config/homeserver.py | |
| parent | Merge pull request #1141 from matrix-org/erikj/replication_noop (diff) | |
| parent | Implement pluggable password auth (diff) | |
| download | synapse-35e2cc8b5278e5db31920392741ac7ff22b3ee24.tar.xz | |
Merge pull request #1155 from matrix-org/erikj/pluggable_pwd_auth
Implement pluggable password auth
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 79b0534b3b..0f890fc04a 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -30,7 +30,7 @@ from .saml2 import SAML2Config from .cas import CasConfig from .password import PasswordConfig from .jwt import JWTConfig -from .ldap import LDAPConfig +from .password_auth_providers import PasswordAuthProviderConfig from .emailconfig import EmailConfig from .workers import WorkerConfig @@ -39,8 +39,8 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - JWTConfig, LDAPConfig, PasswordConfig, EmailConfig, - WorkerConfig,): + JWTConfig, PasswordConfig, EmailConfig, + WorkerConfig, PasswordAuthProviderConfig,): pass |