Update bundle

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 02b880d5d65a2d3834c34202995de63381965d57..6220831642491e998bfe5d8ea18447e791fc4420 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -3,20 +3,16 @@ description "Role applied to all OSMF servers"
 
 default_attributes(
   :apache => {
 
 default_attributes(
   :apache => {

-    :mpm => "prefork",

     :timeout => 60,
     :keepalive => false
   },
   :apt => {
     :timeout => 60,
     :keepalive => false
   },
   :apt => {

-    :sources => ["passenger", "brightbox-ruby-ng"]
+    :sources => ["passenger"]

   },
   :elasticsearch => {
     :version => "5.x",
     :cluster => {
       :name => "foundation"
   },
   :elasticsearch => {
     :version => "5.x",
     :cluster => {
       :name => "foundation"

-    },
-    :script => {
-      :disable_dynamic => false

     }
   },
   :memcached => {
     }
   },
   :memcached => {


@@ -45,5 +41,6 @@ run_list(
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",

+  "recipe[foundation::mwg]",

   "recipe[foundation::owg]"
 )
   "recipe[foundation::owg]"
 )