diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-03-15 17:44:39 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-03-15 17:44:39 +0000 |
| commit | 6df1c79c226c9207321122080fcc1d67f260aa3e (patch) | |
| tree | b6316d84c8ae70a23c071492cd608c8341ee7d3d /synapse/config/registration.py | |
| parent | Hook up adding a pusher to the notifier for replication. (diff) | |
| parent | Merge pull request #646 from matrix-org/erikj/reject_invite_federation (diff) | |
| download | synapse-6df1c79c226c9207321122080fcc1d67f260aa3e.tar.xz | |
Merge branch 'develop' into markjh/pushers_stream
Diffstat (limited to 'synapse/config/registration.py')
| -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) |