X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6f0b5afd1a40cf2a4bf274fe43662d92744af333..3f0adbf98daf65d842dc28bf372fba289f6c74ec:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index c69219e54..9522ed62f 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -66,6 +66,7 @@ default_attributes( :dodobas => { :status => :user }, :mhohmann => { :status => :user }, :enelson => { :status => :user }, + :gregrs => { :status => :user }, :ooc => { :status => :role, :members => [:tomh, :blackadder, :timsc, :ollie] @@ -89,11 +90,14 @@ default_attributes( :timeout => 30, :event => { :server_limit => 32, - :max_clients => 800, + :max_request_workers => 800, :threads_per_child => 50, :max_requests_per_child => 10000 } }, + :apt => { + :sources => ["postgresql"] + }, :dev => { :rails => { :master => { @@ -127,11 +131,8 @@ default_attributes( } } }, - :passenger => { - :ruby_version => "2.3" - }, :postgresql => { - :versions => ["9.1", "9.3"], + :versions => ["9.1", "9.5"], :settings => { :defaults => { :shared_buffers => "1GB", @@ -143,7 +144,7 @@ default_attributes( "9.1" => { :port => "5433" }, - "9.3" => { + "9.5" => { :port => "5432" } }