Bump actions/cache from 2.1.7 to 3

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 6220831642491e998bfe5d8ea18447e791fc4420..466e575f1c259bb7c60f63512ef199f7a1062df1 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -2,15 +2,11 @@ name "foundation"
 description "Role applied to all OSMF servers"
 
 default_attributes(
 description "Role applied to all OSMF servers"
 
 default_attributes(

-  :apache => {
-    :timeout => 60,
-    :keepalive => false
-  },

   :apt => {
     :sources => ["passenger"]
   },
   :elasticsearch => {
   :apt => {
     :sources => ["passenger"]
   },
   :elasticsearch => {

-    :version => "5.x",
+    :version => "6.x",

     :cluster => {
       :name => "foundation"
     }
     :cluster => {
       :name => "foundation"
     }


@@ -26,8 +22,6 @@ default_attributes(
         :innodb_buffer_pool_size => "512M",
         :key_buffer_size => "64M",
         :max_connections => "200",
         :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"
       }
         :sort_buffer_size => "8M",
         :tmp_table_size => "48M"
       }