X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/67dd81a83b573132e0423134ab5dfbbde7da71e3..97b22cb709e69073a375b323ed7760b8a2d4f891:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index b66308426..a68f94c8c 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -67,6 +67,8 @@ default_attributes( :mhohmann => { :status => :user }, :enelson => { :status => :user }, :gregrs => { :status => :user }, + :stereo => { :status => :user }, + :dmlu => { :status => :user }, :ooc => { :status => :role, :members => [:tomh, :blackadder, :timsc, :ollie] @@ -95,49 +97,60 @@ default_attributes( :max_connections_per_child => 10000 } }, - :apt => { - :sources => ["postgresql"] - }, :dev => { :rails => { :master => { :repository => "https://git.openstreetmap.org/public/rails.git", :revision => "master", + :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git", + :cgimap_revision => "master", :aliases => ["api06.dev.openstreetmap.org"] }, :tomh => { - :repository => "git://github.com/tomhughes/openstreetmap-website.git", + :repository => "https://github.com/tomhughes/openstreetmap-website.git", :revision => "next" }, - :owl => { - :repository => "git://github.com/ppawel/openstreetmap-website.git", - :revision => "owl-activity-tab" - }, :comments => { - :repository => "git://github.com/ukasiu/openstreetmap-website.git", + :repository => "https://github.com/ukasiu/openstreetmap-website.git", :revision => "comments_list" }, :locale => { - :repository => "git://github.com/tomhughes/openstreetmap-website.git", + :repository => "https://github.com/tomhughes/openstreetmap-website.git", :revision => "locale" + }, + :microcosms => { + :repository => "https://github.com/openbrian/osm-microcosms.git", + :revision => "microcosms" + }, + :upload => { + :repository => "https://git.openstreetmap.org/public/rails.git", + :revision => "master", + :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git", + :cgimap_revision => "feature/bulk_upload" + }, + :oauth2 => { + :repository => "https://github.com/tomhughes/openstreetmap-website.git", + :revision => "doorkeeper", + :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git", + :cgimap_revision => "feature/oauth2" } } }, :postgresql => { - :versions => ["9.1", "9.5"], + :versions => ["13"], :settings => { :defaults => { + :max_connections => "500", :shared_buffers => "1GB", :work_mem => "32MB", :maintenance_work_mem => "64MB", :max_stack_depth => "4MB", :effective_cache_size => "4GB" }, - "9.1" => { - :port => "5433" - }, - "9.5" => { - :port => "5432" + "13" => { + :port => "5432", + :wal_level => "logical", + :max_replication_slots => "1" } } },