X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b1b9d1a24cd4ec5bc9176af4342697a739db64e7..0fb1998d0fa1a3867b036e08ef2f637ea14e33ce:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 70b6e1615..3c9ae8196 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] @@ -100,45 +102,55 @@ default_attributes( :master => { :repository => "https://git.openstreetmap.org/public/rails.git", :revision => "master", - :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git", + :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" }, :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 => "git://github.com/zerebubuth/openstreetmap-cgimap.git", + :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git", :cgimap_revision => "feature/bulk_upload" + }, + :argon2 => { + :repository => "https://github.com/tomhughes/openstreetmap-website.git", + :revision => "argon2", + :cgimap_repository => "https://github.com/mmd-osm/openstreetmap-cgimap.git", + :cgimap_revision => "feature/argon2" } } }, :postgresql => { - :versions => ["9.1", "9.5"], + :versions => ["14"], :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" + "14" => { + :port => "5432", + :wal_level => "logical", + :max_replication_slots => "1" } } },