Merge remote-tracking branch 'github/pull/528'

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index be9510f7003fe6f4ee730bc718af5752ae4139da..b7243e2934d6625d74d67362f580f62c2c68e6fd 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,13 +18,14 @@ default_attributes(
     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {

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

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

-    :trusted_users => ["www-data"],
+    :smarthost_via => "fafnir.openstreetmap.org:26",
+    :trusted_users => %w[www-data wiki],

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


@@ -37,10 +38,18 @@ default_attributes(
     ]
   },
   :memcached => {
     ]
   },
   :memcached => {

-    :memory_limit => 1024,
+    :memory_limit => 4096,

     :connection_limit => 8192,
     :connection_limit => 8192,

-    :chunk_growth_factor => 1.05,
-    :min_item_size => 5
+    :chunk_growth_factor => 1.25,
+    :min_item_size => 48
+  },
+  :sysctl => {
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    }

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


@@ -48,8 +57,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"
       }