Switch from old recaptcha to recaptcha-nocaptcha

The newer recaptcha-nocaptcha implementation is a little better at
thwarting script-driven spammers and vandals, so switch to it. Leave
the parameter names for the old recaptcha implementation in place
until our consumer in the openstack_project::wiki class no longer
attempts to set it.

Change-Id: I435484cd65a028d774dfd920ca19f3077d4e03fb
This commit is contained in:
Jeremy Stanley 2016-08-20 14:29:29 +00:00
parent e91131f664
commit 28767a5486
2 changed files with 9 additions and 8 deletions

View File

@ -12,8 +12,10 @@ class mediawiki(
$ssl_chain_file_contents = undef,
$ssl_key_file = undef,
$ssl_key_file_contents = undef,
$wg_recaptchapublickey = undef,
$wg_recaptchaprivatekey = undef,
$wg_recaptchapublickey = undef, # TODO: remove (no longer used)
$wg_recaptchaprivatekey = undef, # TODO: remove (no longer used)
$wg_recaptchasitekey = undef,
$wg_recaptchasecretkey = undef,
$wg_googleanalyticsaccount = undef,
$wg_dbserver = 'localhost',
$wg_dbname = 'openstack_wiki',

View File

@ -189,12 +189,11 @@ $wgNamespacesWithSubpages[110] = true;
# https://www.mediawiki.org/wiki/Extension:QuestyCaptcha
require_once( "$IP/extensions/ConfirmEdit/ConfirmEdit.php" );
#Enable ReCaptcha
require_once "$IP/extensions/ConfirmEdit/ReCaptcha.php";
$wgCaptchaClass = 'ReCaptcha';
$wgReCaptchaPublicKey = "<%= @wg_recaptchapublickey %>";
$wgReCaptchaPrivateKey = "<%= @wg_recaptchaprivatekey %>";
#Enable ReCaptchaNoCaptcha
wfLoadExtensions( array( 'ConfirmEdit', 'ConfirmEdit/ReCaptchaNoCaptcha' ) );
$wgCaptchaClass = 'ReCaptchaNoCaptcha';
$wgReCaptchaSiteKey = "<%= @wg_recaptchasitekey %>";
$wgReCaptchaSecretKey = "<%= @wg_recaptchasecretkey %>";
$wgMainCacheType = CACHE_ANYTHING;
$wgCaptchaTriggers['edit'] = true;