X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5dbcbc9fc104320252388249ad1fbb9984bb5339..c542bda465ac23b29950c40db3c9a9617e2e50a5:/roles/foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 4926edeb2..622083164 100644
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -3,7 +3,6 @@ description "Role applied to all OSMF servers"
 
 default_attributes(
   :apache => {
-    :mpm => "prefork",
     :timeout => 60,
     :keepalive => false
   },
@@ -11,17 +10,28 @@ default_attributes(
     :sources => ["passenger"]
   },
   :elasticsearch => {
+    :version => "5.x",
     :cluster => {
       :name => "foundation"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :memcached => {
     :memory_limit => 400,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
+  },
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :innodb_buffer_pool_size => "512M",
+        :key_buffer_size => "64M",
+        :max_connections => "200",
+        :query_cache_size => "48M",
+        :query_cache_type => "1",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "48M"
+      }
+    }
   }
 )
 
@@ -30,5 +40,7 @@ run_list(
   "role[elasticsearch]",
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
-  "recipe[foundation::dwg]"
+  "recipe[foundation::dwg]",
+  "recipe[foundation::mwg]",
+  "recipe[foundation::owg]"
 )