diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-17 10:58:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 10:58:52 +0100 |
| commit | f1073ad43d04dfbdc12474a4d4ccc1be3617fa77 (patch) | |
| tree | d519760f3b97d578c741d5062223189157285a99 /synapse/config/homeserver.py | |
| parent | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode (diff) | |
| parent | Use worker_ prefixes for worker config, use existing support for multiple con... (diff) | |
| download | synapse-f1073ad43d04dfbdc12474a4d4ccc1be3617fa77.tar.xz | |
Merge pull request #874 from matrix-org/markjh/worker_config
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 |