X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..561cb0e3374ce0203038503cb6bd932d03119cc2:/roles/wiki.rb diff --git a/roles/wiki.rb b/roles/wiki.rb index 4a775325a..69a8743e2 100644 --- a/roles/wiki.rb +++ b/roles/wiki.rb @@ -7,8 +7,24 @@ default_attributes( :wiki => { :status => :role } } }, + :apache => { + :mpm => "event", + :timeout => 30, + :event => { + :server_limit => 32, + :max_request_workers => 800, + :threads_per_child => 50, + :max_connections_per_child => 10000 + } + }, + :elasticsearch => { + :version => "6.x", + :cluster => { + :name => "wiki" + } + }, :exim => { - :trusted_users => ["www-data"], + :trusted_users => %w[www-data wiki], :aliases => { :root => "grant" }, @@ -26,19 +42,20 @@ default_attributes( :chunk_growth_factor => 1.05, :min_item_size => 5 }, - :apache => { - :mpm => "prefork", - :timeout => 30, - :event => { - :server_limit => 32, - :max_clients => 800, - :threads_per_child => 50, - :max_requests_per_child => 10000 + :mysql => { + :settings => { + :mysqld => { + :innodb_buffer_pool_size => "4G", + :key_buffer_size => "64M", + :max_connections => "200", + :sort_buffer_size => "8M", + :tmp_table_size => "128M" + } } } ) run_list( - "recipe[elasticsearch]", + "role[elasticsearch]", "recipe[wiki]" )