X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f12949b32dbf868a911b64a16cf74bd38e775d49..9c49d7d9f6b1d896af62fea9455fcd9bfe94ccc3:/roles/foundation.rb?ds=sidebyside diff --git a/roles/foundation.rb b/roles/foundation.rb index f306fe925..622083164 100644 --- a/roles/foundation.rb +++ b/roles/foundation.rb @@ -3,20 +3,16 @@ 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 => { @@ -45,5 +41,6 @@ run_list( "recipe[foundation::wiki]", "recipe[foundation::board]", "recipe[foundation::dwg]", + "recipe[foundation::mwg]", "recipe[foundation::owg]" )