summary refs log tree commit diff
path: root/synapse/config/captcha.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
commit4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9 (patch)
tree43ac96a5b91bbc498228f44798cdc260de1f47c0 /synapse/config/captcha.py
parentApply the pusher http hack in the right place (#4692) (diff)
parentLogging improvements for the pusher (#4691) (diff)
downloadsynapse-4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/captcha.py')
-rw-r--r--synapse/config/captcha.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py

index 7ba0c2de6a..4064891ffb 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py
@@ -30,14 +30,17 @@ class CaptchaConfig(Config): # See docs/CAPTCHA_SETUP for full details of configuring this. # This Home Server's ReCAPTCHA public key. + # recaptcha_public_key: "YOUR_PUBLIC_KEY" # This Home Server's ReCAPTCHA private key. + # recaptcha_private_key: "YOUR_PRIVATE_KEY" # Enables ReCaptcha checks when registering, preventing signup # unless a captcha is answered. Requires a valid ReCaptcha # public/private key. + # enable_registration_captcha: False # A secret key used to bypass the captcha test entirely.