diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-28 13:39:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-28 13:39:42 +0100 |
| commit | 327ca883ec51780ea2a914d3c89ca0499f4656ac (patch) | |
| tree | dc3f2c06cdbbfce8b1d1bb6a4db31a8852f5b43a /synapse/config/captcha.py | |
| parent | Quickly fix dodgy est. time remaining (diff) | |
| parent | Merge pull request #126 from matrix-org/csauth (diff) | |
| download | synapse-327ca883ec51780ea2a914d3c89ca0499f4656ac.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to 'synapse/config/captcha.py')
| -rw-r--r-- | synapse/config/captcha.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py index 7e21c7414d..07fbfadc0f 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py @@ -20,6 +20,7 @@ class CaptchaConfig(Config): def __init__(self, args): super(CaptchaConfig, self).__init__(args) self.recaptcha_private_key = args.recaptcha_private_key + self.recaptcha_public_key = args.recaptcha_public_key self.enable_registration_captcha = args.enable_registration_captcha self.captcha_ip_origin_is_x_forwarded = ( args.captcha_ip_origin_is_x_forwarded @@ -31,8 +32,12 @@ class CaptchaConfig(Config): super(CaptchaConfig, cls).add_arguments(parser) group = parser.add_argument_group("recaptcha") group.add_argument( + "--recaptcha-public-key", type=str, default="YOUR_PUBLIC_KEY", + help="This Home Server's ReCAPTCHA public key." + ) + group.add_argument( "--recaptcha-private-key", type=str, default="YOUR_PRIVATE_KEY", - help="The matching private key for the web client's public key." + help="This Home Server's ReCAPTCHA private key." ) group.add_argument( "--enable-registration-captcha", type=bool, default=False, |