diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-11 17:57:58 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-11 21:39:14 +0000 |
| commit | 4fddf8fc77496d9bb3b5fa8835f0e5ba9a5a9926 (patch) | |
| tree | 642076f830711fb2e967799b136cb92030e2026b /synapse/config/homeserver.py | |
| parent | Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/work (diff) | |
| download | synapse-4fddf8fc77496d9bb3b5fa8835f0e5ba9a5a9926.tar.xz | |
Infer no_tls from presence of TLS listeners
Rather than have to specify `no_tls` explicitly, infer whether we need to load the TLS keys etc from whether we have any TLS-enabled listeners.
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 5aad062c36..727fdc54d8 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -42,7 +42,7 @@ from .voip import VoipConfig from .workers import WorkerConfig -class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, +class HomeServerConfig(ServerConfig, TlsConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, |