commit aa9671e42690671b1d7b1d19372d833c8d81c1be Author: Isis Lovecruft <isis@torproject.org> Date: Wed May 14 20:01:25 2014 +0000 Rename config var RECAPTCHA_PRIV_KEY → RECAPTCHA_SEC_KEY. --- README | 2 +- bridgedb.conf | 7 +++++-- lib/bridgedb/HTTPServer.py | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index c5adf54..e41fb4b 100644 --- a/README +++ b/README @@ -166,7 +166,7 @@ bridgedb.conf: RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY - RECAPTCHA_PRIV_KEY + RECAPTCHA_SEC_KEY A [recaptcha.net](https://www.google.com/recaptcha) account is required. diff --git a/bridgedb.conf b/bridgedb.conf index 0b27adc..eaf82ed 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,14 @@ # for details. # :copyright: (c) 2007-2013 The Tor Project, Inc. # (c) 2007-2013, all sentient entities within the AUTHORS file -# :version: 0.0.7 +# :version: 0.0.8 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.8 - 2014-05-14 +# * CHANGE RECAPTCHA_PRIV_KEY to RECAPTCHA_SEC_KEY. +# # Changes in version 0.0.7 - 2014-03-31 # * ADD new settings for tracing function calls and thread info within logged # messages: LOG_THREADS, LOG_TRACE, and LOG_TIME_FORMAT. @@ -242,7 +245,7 @@ RECAPTCHA_ENABLED = False # Recaptcha API keys RECAPTCHA_PUB_KEY = '' -RECAPTCHA_PRIV_KEY = '' +RECAPTCHA_SEC_KEY = '' # The remoteip we send to reCAPTCHA during verification RECAPTCHA_REMOTEIP = '' diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 7c4689a..328d7a3 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -837,7 +837,7 @@ def addWebServer(cfg, dist, sched): HTTPS_USE_IP_FROM_FORWARDED_HEADER RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY - RECAPTCHA_PRIV_KEY + RECAPTCHA_SEC_KEY RECAPTCHA_REMOTEIP GIMP_CAPTCHA_ENABLED GIMP_CAPTCHA_DIR @@ -864,7 +864,7 @@ def addWebServer(cfg, dist, sched): if cfg.RECAPTCHA_ENABLED: protected = ReCaptchaProtectedResource( - recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, + recaptchaPrivKey=cfg.RECAPTCHA_SEC_KEY, recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY, remoteip=cfg.RECAPTCHA_REMOTEIP, useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER,