X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7013f21316fbdc86a8a36c7aea7f908878db6ef7..4a2bda00ca60530e312587a1610d258f86b497c5:/roles/wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 9298395af..1e19d9df1 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,16 +7,24 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
+  :apache => {
+    :mpm => "event",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_request_workers => 800,
+      :threads_per_child => 50,
+      :max_connections_per_child => 10000
+    }
+  },
   :elasticsearch => {
+    :version => "7.x",
     :cluster => {
       :name => "wiki"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :exim => {
-    :trusted_users => ["www-data"],
+    :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
     },
@@ -29,19 +37,28 @@ 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
   },
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_request_workers => 800,
-      :threads_per_child => 50,
-      :max_connections_per_child => 10000
+  :sysctl => {
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    }
+  },
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :innodb_buffer_pool_size => "4G",
+        :key_buffer_size => "64M",
+        :max_connections => "500",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "128M"
+      }
     }
   }
 )