mediawiki: ensure caches are set to expected value

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 2155e3430eadba6e1b908c111366ca5720557f68..0d15cdef4dd36241a4d95995241d43d91613cae7 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -33,6 +33,7 @@ package %w[
   php-gd
   php-igbinary
   php-intl
   php-gd
   php-igbinary
   php-intl

+  php-memcache

   php-mbstring
   php-mysql
   php-xml
   php-mbstring
   php-mysql
   php-xml

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 5c88ccce55b90b14a5391d4b5833d2fa2bdc31b7..f50ae6866ea486adfcccf8f428c8e35756ca16d6 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -72,6 +72,9 @@ $wgDBmysql5 = false;
 
 ## Shared memory settings
 $wgMainCacheType    = CACHE_MEMCACHED;
 
 ## Shared memory settings
 $wgMainCacheType    = CACHE_MEMCACHED;

+$wgParserCacheType  = CACHE_MEMCACHED;
+$wgMessageCacheType = CACHE_MEMCACHED;
+$wgSessionCacheType = CACHE_MEMCACHED;

 $wgMemCachedServers = array('127.0.0.1:11211');
 $wgSessionsInObjectCache = TRUE;
 
 $wgMemCachedServers = array('127.0.0.1:11211');
 $wgSessionsInObjectCache = TRUE;
 


@@ -218,7 +221,12 @@ $wgNamespacesWithSubpages[NS_MAIN] = true;
 
 # DNS Blacklists to use
 $wgEnableDnsBlacklist = true;
 
 # DNS Blacklists to use
 $wgEnableDnsBlacklist = true;

-$wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.', 'dnsbl-2.uceprotect.net.' );
+$wgDnsBlacklistUrls = [
+  'proxies.dnsbl.sorbs.net.',
+  'opm.tornevall.org.',
+  'xbl.spamhaus.org.',
+  'dnsbl-2.uceprotect.net.'
+];

 
 # Require validated email to edit
 $wgEmailConfirmToEdit = true;
 
 # Require validated email to edit
 $wgEmailConfirmToEdit = true;


@@ -238,9 +246,31 @@ $wgJobRunRate = 0.01;
 $wgFixDoubleRedirects = TRUE;
 
 # Allow external images from a few sites
 $wgFixDoubleRedirects = TRUE;
 
 # Allow external images from a few sites

-$wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'https://tile.openstreetmap.org', 'http://josm.openstreetmap.de/', 'http://trac.openstreetmap.org/', 'http://rweait.dev.openstreetmap.org/' );
-
-$wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' );
+$wgAllowExternalImagesFrom = [
+  'http://tile.openstreetmap.org/',
+  'https://tile.openstreetmap.org',
+  'http://josm.openstreetmap.de/'
+];
+
+$wgNoFollowDomainExceptions = [
+  'www.openstreetmap.org',
+  'josm.openstreetmap.de',
+  'taginfo.openstreetmap.org',
+  'blog.openstreetmap.org',
+  'forum.openstreetmap.org',
+  'community.openstreetmap.org',
+  'lists.openstreetmap.org',
+  'help.openstreetmap.org',
+  'switch2osm.org',
+  'wiki.osmfoundation.org',
+  'www.openstreetmap.us',
+  'learnosm.org',
+  'nominatim.org',
+  'openstreetmap.community',
+  'www.openstreetbrowser.org',
+  'openinframap.org',
+  'leafletjs.com'
+];

 
 # FIXME - move to specific
 $wgAllowUserJs = TRUE;
 
 # FIXME - move to specific
 $wgAllowUserJs = TRUE;

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 69a8743e2dd2652491fa245960f408d623d706f0..057131b914846f3fa7a9d4c771cd0f06551563d2 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -39,8 +39,8 @@ default_attributes(
   :memcached => {
     :memory_limit => 1024,
     :connection_limit => 8192,
   :memcached => {
     :memory_limit => 1024,
     :connection_limit => 8192,

-    :chunk_growth_factor => 1.05,
-    :min_item_size => 5
+    :chunk_growth_factor => 1.25,
+    :min_item_size => 48

   },
   :mysql => {
     :settings => {
   },
   :mysql => {
     :settings => {