diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2017-12-05 11:09:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 11:09:47 +0000 |
| commit | 33cb7ef0b7f0c8e31abf580ba3ffa33c255f0a55 (patch) | |
| tree | 196666de4e0fe2263544c8db3f74dbc48798e64a /synapse/config/homeserver.py | |
| parent | Fix error when deleting devices (diff) | |
| parent | fix StoreError syntax (diff) | |
| download | synapse-33cb7ef0b7f0c8e31abf580ba3ffa33c255f0a55.tar.xz | |
Merge pull request #2723 from matrix-org/matthew/search-all-local-users
Add all local users to the user_directory and optionally search them
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 05e242aef6..bf19cfee29 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -36,6 +36,7 @@ from .workers import WorkerConfig from .push import PushConfig from .spam_checker import SpamCheckerConfig from .groups import GroupsConfig +from .user_directory import UserDirectoryConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, @@ -44,7 +45,7 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, JWTConfig, PasswordConfig, EmailConfig, WorkerConfig, PasswordAuthProviderConfig, PushConfig, - SpamCheckerConfig, GroupsConfig,): + SpamCheckerConfig, GroupsConfig, UserDirectoryConfig,): pass |