Get real tile source from Fastly-Client-IP for new tile CDN

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index ddc26d928e02dbdbea34c0d8d09c3d8f1e1cf6e3..9328d2688aff2803bacc14fe20a62c9d464c4049 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -2,16 +2,11 @@ name "foundation"
 description "Role applied to all OSMF servers"
 
 default_attributes(
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 60,
-    :keepalive => false
-  },
   :apt => {
     :sources => ["passenger"]
   },
   :elasticsearch => {
-    :version => "5.x",
+    :version => "6.x",
     :cluster => {
       :name => "foundation"
     }
@@ -42,5 +37,6 @@ run_list(
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",
+  "recipe[foundation::mwg]",
   "recipe[foundation::owg]"
 )