summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2017-10-17 11:45:49 +0100
committerGitHub <noreply@github.com>2017-10-17 11:45:49 +0100
commit4e242b3e20038a2b9253c945dd40980cb381ebfc (patch)
treee5aa8f73504b6be6f8b7c3ce033c2a7ed9424217 /synapse/config
parentMerge pull request #2544 from matrix-org/luke/groups-invited-users (diff)
parentFix test (diff)
downloadsynapse-4e242b3e20038a2b9253c945dd40980cb381ebfc.tar.xz
Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms
Add config option to auto-join new users to rooms
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/registration.py7
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):