diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
| commit | 2d4d2bbae4f35e3128fa492e45cfc5b0750524bc (patch) | |
| tree | 8e3fa03a60443dc2a1af80d5fb13aa0e28ffddca /synapse/config | |
| parent | Write a default log_config when generating config (diff) | |
| parent | Add get_rooms_for_user cache (diff) | |
| download | synapse-2d4d2bbae4f35e3128fa492e45cfc5b0750524bc.tar.xz | |
Merge branch 'develop' into markjh/config_cleanup
Conflicts: synapse/config/captcha.py
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/captcha.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py index ba7037aeb1..ee5c238314 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py @@ -21,6 +21,7 @@ class CaptchaConfig(Config): self.recaptcha_private_key = config["recaptcha_private_key"] self.recaptcha_public_key = config["recaptcha_public_key"] self.enable_registration_captcha = config["enable_registration_captcha"] + # XXX: This is used for more than just captcha self.captcha_ip_origin_is_x_forwarded = ( config["captcha_ip_origin_is_x_forwarded"] ) |