diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-02 11:22:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-02 11:22:40 +0100 |
commit | c193b39134e0afb5a185b535bf79027d1fa699d0 (patch) | |
tree | aa3674c9fe285f74e6ba3ff67e50ce851cfb74c7 /synapse/config | |
parent | Factor out an "assert_requester_is_admin" function (#5120) (diff) | |
parent | Add some limitations to alias creation (diff) | |
download | synapse-c193b39134e0afb5a185b535bf79027d1fa699d0.tar.xz |
Merge pull request #5124 from matrix-org/babolivier/aliases
Add some limitations to alias creation
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/server.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index cc232422b9..147a976485 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -134,6 +134,12 @@ class ServerConfig(Config): # sending out any replication updates. self.replication_torture_level = config.get("replication_torture_level") + # Whether to require a user to be in the room to add an alias to it. + # Defaults to True. + self.require_membership_for_aliases = config.get( + "require_membership_for_aliases", True, + ) + self.listeners = [] for listener in config.get("listeners", []): if not isinstance(listener.get("port", None), int): @@ -490,6 +496,11 @@ class ServerConfig(Config): # Used by phonehome stats to group together related servers. #server_context: context + + # Whether to require a user to be in the room to add an alias to it. + # Defaults to 'true'. + # + #require_membership_for_aliases: false """ % locals() def read_arguments(self, args): |