X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d563d6a7df8c6b5006bcf6eed7b53c4da290c785..ff044920428608b2c04507ad52d6ab52c9d6555f:/roles/dev.rb?ds=inline diff --git a/roles/dev.rb b/roles/dev.rb index bb50ebd29..84ca09be9 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -66,21 +66,21 @@ default_attributes( :zverik => { :status => :user }, :dodobas => { :status => :user }, :mhohmann => { :status => :user }, - :ooc => { - :status => :role, - :members => [ :tomh, :blackadder, :timsc, :ollie ] + :ooc => { + :status => :role, + :members => [ :tomh, :blackadder, :timsc, :ollie ] }, - :apis => { - :status => :role, - :members => [ :tomh ] + :apis => { + :status => :role, + :members => [ :tomh ] }, - :os => { - :status => :role, - :members => [ :tomh, :grant, :ollie ] + :os => { + :status => :role, + :members => [ :tomh, :grant, :ollie ] }, - :gpsmid => { - :status => :role, - :members => [ :apmon, :maba ] + :gpsmid => { + :status => :role, + :members => [ :apmon, :maba ] } } }, @@ -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,13 +125,9 @@ 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_pr" + :revision => "comments_list" } } }, @@ -166,7 +152,7 @@ default_attributes( :sysctl => { :postgres => { :comment => "Increase shared memory for postgres", - :parameters => { + :parameters => { "kernel.shmall" => "4194304", "kernel.shmmax" => "17179869184" }