X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e49218f4d5a297a8a5ccf5998df62ce4e66e6a65..2c1aefb8d788c551ea7a40170c36ac8809a523b0:/roles/wiki.rb?ds=sidebyside

diff --git a/roles/wiki.rb b/roles/wiki.rb
index be9510f70..69a8743e2 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,13 +18,13 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "5.x",
+    :version => "6.x",
     :cluster => {
       :name => "wiki"
     }
   },
   :exim => {
-    :trusted_users => ["www-data"],
+    :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
     },
@@ -48,8 +48,6 @@ default_attributes(
         :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"
       }