X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aa62e82ea7fce41ff5e39fe2f6f66afdbb3f2479..73985606adf9c866cab4e8a414b05fe857a3f46d:/roles/wiki.rb?ds=sidebyside

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 21f6ea8a4..b7243e293 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,13 +18,14 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "5.x",
+    :version => "6.x",
     :cluster => {
       :name => "wiki"
     }
   },
   :exim => {
-    :trusted_users => ["www-data"],
+    :smarthost_via => "fafnir.openstreetmap.org:26",
+    :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
     },
@@ -37,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 => {