mediawiki: ensure caches are set to expected value

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 845f99fe269b6d13cdf0cfc9567486725ac40557..057131b914846f3fa7a9d4c771cd0f06551563d2 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apache => {
     }
   },
   :apache => {

-    :mpm => "prefork",
+    :mpm => "event",

     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,


@@ -18,13 +18,13 @@ default_attributes(
     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {

-    :version => "5.x",
+    :version => "6.x",

     :cluster => {
       :name => "wiki"
     }
   },
   :exim => {
     :cluster => {
       :name => "wiki"
     }
   },
   :exim => {

-    :trusted_users => ["www-data"],
+    :trusted_users => %w[www-data wiki],

     :aliases => {
       :root => "grant"
     },
     :aliases => {
       :root => "grant"
     },


@@ -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 => {


@@ -48,8 +48,6 @@ default_attributes(
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",
         :max_connections => "200",
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",
         :max_connections => "200",

-        :query_cache_size => "256M",
-        :query_cache_type => "1",

         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }
         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }