summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 11:16:49 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 11:16:49 +0100
commit3993d6ecc24e497c9807bd8d99a8c3537862994f (patch)
tree5298473ae753bfc646cc59819e27220763dbadf2 /synapse/config/homeserver.py
parentReorder changelog (diff)
parentAdd config option to disable password login (diff)
downloadsynapse-3993d6ecc24e497c9807bd8d99a8c3537862994f.tar.xz
Merge pull request #322 from matrix-org/erikj/password_config
Add config option to disable password login
Diffstat (limited to '')
-rw-r--r--synapse/config/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py

index 3039f3c0bf..4743e6abc5 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -27,12 +27,14 @@ from .appservice import AppServiceConfig from .key import KeyConfig from .saml2 import SAML2Config from .cas import CasConfig +from .password import PasswordConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, - AppServiceConfig, KeyConfig, SAML2Config, CasConfig): + AppServiceConfig, KeyConfig, SAML2Config, CasConfig, + PasswordConfig,): pass