Merge remote-tracking branch 'github/pull/618'

[chef.git] / cookbooks / mediawiki / templates / default / mw-ext-ConfirmEdit.inc.php.erb

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
index 5b5ffffa65a5d3a56d48a52b836f17f35a81cec8..2e0af37bab4520d2a46cd754620e7a1de43afd1b 100644 (file)
--- a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
@@ -1,12 +1,12 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-wfLoadExtensions( array( 'ConfirmEdit', 'ConfirmEdit/ReCaptchaNoCaptcha' ) );
-$wgCaptchaClass = 'ReCaptchaNoCaptcha';
-$wgReCaptchaSendRemoteIP = true;
-$recaptcha_public_key = '<%= @public_key %>';
-$recaptcha_private_key = '<%= @private_key %>';
-
-$wgCaptchaTriggers['addurl'] = true;
-$wgCaptchaTriggers['create'] = true;
+wfLoadExtensions( array( 'ConfirmEdit', 'ConfirmEdit/hCaptcha' ) );
+$wgHCaptchaSendRemoteIP = true;
+$wgHCaptchaSiteKey = '<%= @public_key %>';
+$wgHCaptchaSecretKey = '<%= @private_key %>';
 
 $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = true;
+$wgGroupPermissions['bot'          ]['skipcaptcha'] = true;
+$wgGroupPermissions['sysop'        ]['skipcaptcha'] = true;
+
+$wgRateLimits['badcaptcha']['newbie'] = [ 100, 86400 ];