Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

config: Add detail to auto_join_rooms comment #9291

Merged
merged 4 commits into from
Feb 3, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/9291.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add configuration detail to auto_join_rooms comment.
dykstranet marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions docs/sample_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions synapse/config/registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
dykstranet marked this conversation as resolved.
Show resolved Hide resolved
#
#auto_join_rooms:
# - "#example:example.com"
Expand Down