X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4c5b70d3c889be2ac817fb9181ed9448fe0ef4c2..fbc477801afb01cf547cddd5af9e0d931030ad04:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 0e17896e3..0a9b76f28 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -64,6 +64,8 @@ default_attributes( :lonvia => { :status => :user }, :nicolas17 => { :status => :user }, :zverik => { :status => :user }, + :dodobas => { :status => :user }, + :mhohmann => { :status => :user }, :ooc => { :status => :role, :members => [ :tomh, :blackadder, :timsc, :ollie ] @@ -92,15 +94,7 @@ default_attributes( :max_requests_per_child => 10000 } }, - :apt => { - :sources => [ - "brightbox-ruby-ng", - "ubuntugis-stable", "ubuntugis-unstable", - "mapnik-v210" - ] - }, :dev => { - :ruby => "1.9.1", :rails => { :master => { :repository => "git://git.openstreetmap.org/rails.git", @@ -119,30 +113,22 @@ default_attributes( :repository => "git://github.com/ppawel/openstreetmap-website.git", :revision => "owl-history-tab" }, - :overpass => { - :repository => "git://github.com/drolbr/openstreetmap-website.git", - :revision => "master" - }, - :mapui => { - :repository => "git://github.com/osmlab/openstreetmap-website.git", - :revision => "map-ui" - }, :groups => { :repository => "git://github.com/osmlab/openstreetmap-website.git", :revision => "groups-sketch" }, - :welcome => { - :repository => "git://github.com/osmlab/openstreetmap-website.git", - :revision => "welcome-2" + :jsrouting => { + :repository => "git://github.com/systemed/openstreetmap-website.git", + :revision => "routing" }, - :hash => { - :repository => "git://github.com/osmlab/openstreetmap-website.git", - :revision => "hash" + :jsrouting2 => { + :repository => "git://github.com/jfirebaugh/openstreetmap-website.git", + :revision => "routing" } } }, :postgresql => { - :versions => [ "9.1" ], + :versions => [ "9.1", "9.3" ], :settings => { :defaults => { :shared_buffers => "1GB", @@ -153,6 +139,9 @@ default_attributes( }, "9.1" => { :port => "5433" + }, + "9.3" => { + :port => "5432" } } },