mediawiki: Use less aggressive DNSBLs

[chef.git] / cookbooks / mediawiki / templates / default / LocalSettings.php.erb

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index e808f06a7e83f1c9cad0b9f5ff6ed722c2ebf19d..d26a0d0bb1813df8f3f6b8ffd6d1cd1031efb348 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -56,7 +56,6 @@ $wgEnotifUseJobQ       = true;
 
 $wgSMTP = [
   "host" => "localhost",
-  "localhost" => "<%= node[:fqdn] %>",
   "socket_options" => [
     "ssl" => [
       "verify_peer_name" => false
@@ -139,7 +138,7 @@ $wgShellLocale = "en_US.utf8";
 ## Set $wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
 ## be publically accessible from the web.
-#$wgCacheDirectory = "$IP/cache";
+$wgCacheDirectory = "$IP/cache";
 
 # Site language code, should be one of the list in ./languages/Names.php
 $wgLanguageCode = "en";
@@ -232,10 +231,9 @@ $wgNamespacesWithSubpages[NS_MAIN] = true;
 # DNS Blacklists to use
 $wgEnableDnsBlacklist = true;
 $wgDnsBlacklistUrls = [
-  'proxies.dnsbl.sorbs.net.',
-  'opm.tornevall.org.',
+  'http.dnsbl.sorbs.net.',
   'xbl.spamhaus.org.',
-  'dnsbl-2.uceprotect.net.'
+  'dnsbl-1.uceprotect.net.'
 ];
 
 # Require validated email to edit
@@ -393,7 +391,8 @@ $wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contribut
 <% end -%>
 
 <% if @name == "wiki.openstreetmap.org" -%>
-# Placeholder for the wiki.openstreetmap.org specific config
+# wiki.openstreetmap.org specific config loaded after extensions
+$wgRCWatchCategoryMembership = true;
 <% end -%>
 
 <% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%>