diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-14 16:53:53 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-14 16:53:53 +0000 |
| commit | 6b1e9b8dfecb8cd1e87cf0d2857735f27797649d (patch) | |
| tree | fba4b3fd65c8a3a133de3611ba024bc0bea682d1 /synapse/config | |
| parent | Return list, not generator. (diff) | |
| parent | Add config to create guest account on 3pid invite (diff) | |
| download | synapse-6b1e9b8dfecb8cd1e87cf0d2857735f27797649d.tar.xz | |
Merge pull request #645 from matrix-org/erikj/3pid_guest_config
Add config to create guest account on 3pid invite
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/registration.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index ab062d528c..87e500c97a 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -37,6 +37,10 @@ class RegistrationConfig(Config): self.trusted_third_party_id_servers = config["trusted_third_party_id_servers"] self.allow_guest_access = config.get("allow_guest_access", False) + self.invite_3pid_guest = ( + self.allow_guest_access and config.get("invite_3pid_guest", False) + ) + def default_config(self, **kwargs): registration_shared_secret = random_string_with_symbols(50) |