X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/da1115e80fdbca939aa7b2f8b2027705f1c32b24..5919a0168e927c655ce23acc885413864f0ebfcf:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 9e79e0a69..0a9b76f28 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -65,6 +65,7 @@ default_attributes( :nicolas17 => { :status => :user }, :zverik => { :status => :user }, :dodobas => { :status => :user }, + :mhohmann => { :status => :user }, :ooc => { :status => :role, :members => [ :tomh, :blackadder, :timsc, :ollie ] @@ -93,12 +94,6 @@ default_attributes( :max_requests_per_child => 10000 } }, - :apt => { - :sources => [ - "ubuntugis-stable", - "mapnik-v210" - ] - }, :dev => { :rails => { :master => { @@ -118,10 +113,6 @@ 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" - }, :groups => { :repository => "git://github.com/osmlab/openstreetmap-website.git", :revision => "groups-sketch" @@ -129,11 +120,15 @@ default_attributes( :jsrouting => { :repository => "git://github.com/systemed/openstreetmap-website.git", :revision => "routing" + }, + :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", @@ -144,6 +139,9 @@ default_attributes( }, "9.1" => { :port => "5433" + }, + "9.3" => { + :port => "5432" } } },