Fix backup expiry script to match prefixes correctly

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 7d46dc74880856e3996e4ddc0d51c86ee9029b18..466e575f1c259bb7c60f63512ef199f7a1062df1 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(
 description "Role applied to all OSMF servers"
 
 default_attributes(

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

   :apt => {
   :apt => {

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

   },
   :elasticsearch => {
   },
   :elasticsearch => {

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

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

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

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


@@ -30,7 +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",

         :sort_buffer_size => "8M",
         :tmp_table_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::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",

+  "recipe[foundation::mwg]",

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