X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/720dcf829378305b21bfde8f1b23e6827145973f..21c251d4b15d31087c1d892495f3d88e4cbe2840:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 373b1c18c..6f49fae6d 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -90,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 + :max_connections_per_child => 10000 } }, + :apt => { + :sources => ["postgresql"] + }, :dev => { :rails => { :master => { @@ -110,10 +113,6 @@ default_attributes( :repository => "git://github.com/ppawel/openstreetmap-website.git", :revision => "owl-activity-tab" }, - :groups => { - :repository => "git://github.com/osmlab/openstreetmap-website.git", - :revision => "groups-sketch" - }, :comments => { :repository => "git://github.com/ukasiu/openstreetmap-website.git", :revision => "comments_list" @@ -129,7 +128,7 @@ default_attributes( } }, :postgresql => { - :versions => ["9.1", "9.3"], + :versions => ["9.1", "9.5"], :settings => { :defaults => { :shared_buffers => "1GB", @@ -141,7 +140,7 @@ default_attributes( "9.1" => { :port => "5433" }, - "9.3" => { + "9.5" => { :port => "5432" } }