Bump test-kitchen from 3.4.0 to 3.5.0

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 5f863b3c59b4689c7db27646a31655d65f6727f6..b7243e2934d6625d74d67362f580f62c2c68e6fd 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,12 +18,13 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "5.x",
+    :version => "6.x",
     :cluster => {
       :name => "wiki"
     }
   },
   :exim => {
+    :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 => {