X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e3956086c7d1f49f5ed58ce014741dfca2505990..f17e3ae797bc5031f9f0fc4aecf69651516b282f:/roles/wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index edb21ab29..b7243e293 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apache => {
-    :mpm => "prefork",
+    :mpm => "event",
     :timeout => 30,
     :event => {
       :server_limit => 32,
@@ -18,16 +18,14 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "6.x",
     :cluster => {
       :name => "wiki"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :exim => {
-    :trusted_users => ["www-data"],
+    :smarthost_via => "fafnir.openstreetmap.org:26",
+    :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
     },
@@ -40,10 +38,18 @@ default_attributes(
     ]
   },
   :memcached => {
-    :memory_limit => 1024,
+    :memory_limit => 4096,
     :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 => {
@@ -51,7 +57,6 @@ default_attributes(
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",
         :max_connections => "200",
-        :query_cache_size => "256M",
         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }