Merge remote-tracking branch 'github/pull/391'

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 7d46dc74880856e3996e4ddc0d51c86ee9029b18..85efc53f7a0b3f41e68d6949fb556921fd9115df 100644 (file)
--- 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 => "5.x",
     :cluster => {
       :name => "foundation"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :memcached => {
@@ -31,6 +23,7 @@ default_attributes(
         :key_buffer_size => "64M",
         :max_connections => "200",
         :query_cache_size => "48M",
+        :query_cache_type => "1",
         :sort_buffer_size => "8M",
         :tmp_table_size => "48M"
       }
@@ -44,5 +37,6 @@ run_list(
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",
+  "recipe[foundation::mwg]",
   "recipe[foundation::owg]"
 )