X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3f0adbf98daf65d842dc28bf372fba289f6c74ec..fbd5b3a2328444fa5419b62ac79bfa7b91bfcdb1:/roles/dev.rb?ds=sidebyside diff --git a/roles/dev.rb b/roles/dev.rb index 9522ed62f..17b5c4726 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -92,7 +92,7 @@ default_attributes( :server_limit => 32, :max_request_workers => 800, :threads_per_child => 50, - :max_requests_per_child => 10000 + :max_connections_per_child => 10000 } }, :apt => { @@ -101,33 +101,29 @@ default_attributes( :dev => { :rails => { :master => { - :repository => "git://git.openstreetmap.org/rails.git", + :repository => "https://git.openstreetmap.org/public/rails.git", :revision => "master", + :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git", + :cgimap_revision => "master", :aliases => ["api06.dev.openstreetmap.org"] }, :tomh => { :repository => "git://github.com/tomhughes/openstreetmap-website.git", :revision => "next" }, - :owl => { - :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" }, - :moderation => { - :repository => "git://github.com/sbagroy986/openstreetmap-website.git", - :revision => "moderation_queue" - }, :locale => { :repository => "git://github.com/tomhughes/openstreetmap-website.git", :revision => "locale" + }, + :upload => { + :repository => "https://git.openstreetmap.org/public/rails.git", + :revision => "master", + :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git", + :cgimap_revision => "feature/bulk_upload" } } },