X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e3956086c7d1f49f5ed58ce014741dfca2505990..4ed87e86c638523d093bc97b32715c4c6a41a70d:/roles/foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 7d46dc748..466e575f1 100644
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -2,21 +2,13 @@ name "foundation"
 description "Role applied to all OSMF servers"
 
 default_attributes(
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 60,
-    :keepalive => false
-  },
   :apt => {
-    :sources => ["passenger", "brightbox-ruby-ng"]
+    :sources => ["passenger"]
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "6.x",
     :cluster => {
       :name => "foundation"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :memcached => {
@@ -30,7 +22,6 @@ default_attributes(
         :innodb_buffer_pool_size => "512M",
         :key_buffer_size => "64M",
         :max_connections => "200",
-        :query_cache_size => "48M",
         :sort_buffer_size => "8M",
         :tmp_table_size => "48M"
       }
@@ -44,5 +35,6 @@ run_list(
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",
+  "recipe[foundation::mwg]",
   "recipe[foundation::owg]"
 )