X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a2451e749d6b3716f00ac708045c149085e95812..2f9dd0ceb1465da9d43129d827e067315d6aadfd:/roles/dev.rb?ds=sidebyside diff --git a/roles/dev.rb b/roles/dev.rb index 57013c971..45670ffcf 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -94,12 +94,6 @@ default_attributes( :max_requests_per_child => 10000 } }, - :apt => { - :sources => [ - "ubuntugis-stable", - "mapnik-v210" - ] - }, :dev => { :rails => { :master => { @@ -117,11 +111,7 @@ default_attributes( }, :owl => { :repository => "git://github.com/ppawel/openstreetmap-website.git", - :revision => "owl-history-tab" - }, - :overpass => { - :repository => "git://github.com/drolbr/openstreetmap-website.git", - :revision => "master" + :revision => "owl-activity-tab" }, :groups => { :repository => "git://github.com/osmlab/openstreetmap-website.git", @@ -135,18 +125,14 @@ default_attributes( :repository => "git://github.com/jfirebaugh/openstreetmap-website.git", :revision => "routing" }, - :overpass2 => { - :repository => "git://github.com/tomhughes/openstreetmap-website.git", - :revision => "overpass" - }, :comments => { :repository => "git://github.com/ukasiu/openstreetmap-website.git", - :revision => "changeset_comments" + :revision => "comments_list" } } }, :postgresql => { - :versions => [ "9.1" ], + :versions => [ "9.1", "9.3" ], :settings => { :defaults => { :shared_buffers => "1GB", @@ -157,6 +143,9 @@ default_attributes( }, "9.1" => { :port => "5433" + }, + "9.3" => { + :port => "5432" } } },