Teach munin to use internal addresses for Amsterdam machines

[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 0bb3b91ff4ca9b6d2c9c99ab45feb0bcc41eacd8..50e1d480183ccbb5c2ed0de08f5ee83af1d1617d 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,7 +1,12 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
-require_once( $IP.'/extensions/ConfirmEdit/ReCaptcha.php' );
-$wgCaptchaClass = 'ReCaptcha';
-$recaptcha_public_key = '<%= @public_key %>';
-$recaptcha_private_key = '<%= @private_key %>';
+wfLoadExtensions( array( 'ConfirmEdit', 'ConfirmEdit/ReCaptchaNoCaptcha' ) );
+$wgCaptchaClass = 'ReCaptchaNoCaptcha';
+$wgReCaptchaSendRemoteIP = true;
+$wgReCaptchaSiteKey = '<%= @public_key %>';
+$wgReCaptchaSecretKey = '<%= @private_key %>';
+
 $wgCaptchaTriggers['addurl'] = true;
+$wgCaptchaTriggers['create'] = true;
+
+$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = true;