From: Grant Slater <git@firefishy.com>
Date: Fri, 25 Dec 2015 16:03:42 +0000 (+0000)
Subject: Wiki req Captcha on new users adding new urls/page
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fe7af7818af64f64a4f9d505056cbd08aeb5c92c

Wiki req Captcha on new users adding new urls/page
---

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 12d3fb167..d00fa1de3 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -164,6 +164,14 @@ $wgResourceLoaderMaxQueryLength = -1;
 #Only Allow Signed-in users to edit
 $wgGroupPermissions['*']['edit'] = false;
 
+#Only allow autoconfirmed for a few actions
+$wgGroupPermissions['user']['move'] = false;
+$wgGroupPermissions['user']['movefile'] = false;
+$wgGroupPermissions['user']['move-categorypages'] = false;
+$wgGroupPermissions['autoconfirmed']['move'] = false;
+$wgGroupPermissions['autoconfirmed']['movefile'] = false;
+$wgGroupPermissions['autoconfirmed']['move-categorypages'] = false;
+
 #Allow bureaucrat group access to oversight options
 $wgGroupPermissions['bureaucrat']['hideuser'] = true;
 $wgGroupPermissions['bureaucrat']['deletelogentry'] = true;
@@ -196,11 +204,15 @@ $wgNamespacesWithSubpages[NS_MAIN] = true;
 
 #DNS Blacklists to use
 $wgEnableDnsBlacklist = true;
-$wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.' );
+$wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.' 'dnsbl-3.uceprotect.net.' );
 
-#Redirect validated email to edit
+#Require validated email to edit
 $wgEmailConfirmToEdit = true;
 
+#Autopromote users to autoconfirmed
+$wgAutoConfirmAge = 345600; // 4 days
+$wgAutoConfirmCount = 10;
+
 #Disable Hit Counter for Performance
 $wgDisableCounters = TRUE;
 #Disable IP in Header to avoid cache issue
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 18c9d7e74..9af53d723 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
@@ -4,4 +4,8 @@ require_once( $IP.'/extensions/ConfirmEdit/ReCaptcha.php' );
 $wgCaptchaClass = 'ReCaptcha';
 $recaptcha_public_key = '<%= @public_key %>';
 $recaptcha_private_key = '<%= @private_key %>';
-$wgCaptchaTriggers['addurl'] = false;
+
+$wgCaptchaTriggers['addurl'] = true;
+$wgCaptchaTriggers['create'] = true;
+
+$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = true;