From 35a481f09b79173881d56ad332e3e4dee5de4294 Mon Sep 17 00:00:00 2001 From: gary Date: Tue, 2 Feb 2021 11:39:50 +0800 Subject: [PATCH] config: Add detail to auto_join_rooms comment Signed-off-by: Gary Dykstra --- changelog.d/9291.doc | 1 + docs/sample_config.yaml | 3 +++ synapse/config/registration.py | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 changelog.d/9291.doc diff --git a/changelog.d/9291.doc b/changelog.d/9291.doc new file mode 100644 index 000000000000..e79084091bb2 --- /dev/null +++ b/changelog.d/9291.doc @@ -0,0 +1 @@ +Add configuration detail to auto_join_rooms comment. diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index dd2981717d97..72ac58e1add1 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1320,6 +1320,9 @@ account_threepid_delegates: # By default, any room aliases included in this list will be created # as a publicly joinable room when the first user registers for the # homeserver. This behaviour can be customised with the settings below. +# If the room already exists, make certain it is a publicly joinable +# room, i.e. 'Security & Privacy' settings for the room allow 'Anyone +# who knows the room's link, including guests' to access the room. # #auto_join_rooms: # - "#example:example.com" diff --git a/synapse/config/registration.py b/synapse/config/registration.py index ac48913a0bd1..ba5272798ccd 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -378,6 +378,9 @@ def generate_config_section(self, generate_secrets=False, **kwargs): # By default, any room aliases included in this list will be created # as a publicly joinable room when the first user registers for the # homeserver. This behaviour can be customised with the settings below. + # If the room already exists, make certain it is a publicly joinable + # room, i.e. 'Security & Privacy' settings for the room allow 'Anyone + # who knows the room's link, including guests' to access the room. # #auto_join_rooms: # - "#example:example.com"