X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4f918e18a1eb0fc2dc7518d74ed5f3b7017ae3d9..6714dc6e7e6c9cddac0019298976d27f9cf6d263:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 17b5c4726..703cbccf2 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,40 +97,41 @@ 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 => "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" } } }, :postgresql => { - :versions => ["9.1", "9.5"], + :versions => ["9.1", "12"], :settings => { :defaults => { :shared_buffers => "1GB", @@ -140,7 +143,7 @@ default_attributes( "9.1" => { :port => "5433" }, - "9.5" => { + "12" => { :port => "5432" } }