diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-06-16 11:06:12 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-06-16 11:06:12 +0100 |
| commit | 885ee861f7270fef1370a2d63e009a8fceaf8dd5 (patch) | |
| tree | e8a12c137cec49dec4fea35ab424a3c6fdf92aaa /synapse/config/homeserver.py | |
| parent | Merge pull request #866 from bartekrutkowski/develop (diff) | |
| download | synapse-885ee861f7270fef1370a2d63e009a8fceaf8dd5.tar.xz | |
Inline the synchrotron and pusher configs into the main config
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index fc2445484c..79b0534b3b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -32,13 +32,15 @@ from .password import PasswordConfig from .jwt import JWTConfig from .ldap import LDAPConfig from .emailconfig import EmailConfig +from .workers import WorkerConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - JWTConfig, LDAPConfig, PasswordConfig, EmailConfig,): + JWTConfig, LDAPConfig, PasswordConfig, EmailConfig, + WorkerConfig,): pass |