diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:35:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:35:17 +0000 |
| commit | 347146be2928d36937d44130748ead296ed28f94 (patch) | |
| tree | 4960b2026946b938ffd35f371508cdb7adadde3e /synapse/config/registration.py | |
| parent | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Open up /events to anonymous users for room events only (diff) | |
| download | synapse-347146be2928d36937d44130748ead296ed28f94.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index f5ef36a9f4..dca391f7af 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -34,6 +34,7 @@ class RegistrationConfig(Config): self.registration_shared_secret = config.get("registration_shared_secret") self.macaroon_secret_key = config.get("macaroon_secret_key") self.bcrypt_rounds = config.get("bcrypt_rounds", 12) + self.allow_guest_access = config.get("allow_guest_access", False) def default_config(self, **kwargs): registration_shared_secret = random_string_with_symbols(50) @@ -54,6 +55,11 @@ class RegistrationConfig(Config): # Larger numbers increase the work factor needed to generate the hash. # The default number of rounds is 12. bcrypt_rounds: 12 + + # Allows users to register as guests without a password/email/etc, and + # participate in rooms hosted on this server which have been made + # accessible to anonymous users. + allow_guest_access: False """ % locals() def add_arguments(self, parser): |