diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-03 10:27:10 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-03 10:36:40 +0100 |
| commit | 850b103b36205d2c90da46a0d7413e6033de4f94 (patch) | |
| tree | ba63852ef79b9806eb11a65aca883bb00568b7b7 /synapse/config/homeserver.py | |
| parent | Merge pull request #1153 from matrix-org/erikj/ldap_restructure (diff) | |
| download | synapse-850b103b36205d2c90da46a0d7413e6033de4f94.tar.xz | |
Implement pluggable password auth
Allows delegating the password auth to an external module. This also moves the LDAP auth to using this system, allowing it to be removed from the synapse tree entirely in the future.
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 |