diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
| commit | ffba97807746f6f0d7a8820c0d980f188dcad08c (patch) | |
| tree | 36301e98cdc6400afe71b89fc4b0c8beccd0deea /synapse/config/registration.py | |
| parent | Merge pull request #2540 from 4nd3r/patch-1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-ffba97807746f6f0d7a8820c0d980f188dcad08c.tar.xz | |
Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index f7e03c4cde..ef917fc9f2 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -41,6 +41,8 @@ class RegistrationConfig(Config): self.allow_guest_access and config.get("invite_3pid_guest", False) ) + self.auto_join_rooms = config.get("auto_join_rooms", []) + def default_config(self, **kwargs): registration_shared_secret = random_string_with_symbols(50) @@ -70,6 +72,11 @@ class RegistrationConfig(Config): - matrix.org - vector.im - riot.im + + # Users who register on this homeserver will automatically be joined + # to these rooms + #auto_join_rooms: + # - "#example:example.com" """ % locals() def add_arguments(self, parser): |