X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/979e98164cc9a6d7216197f01febc918c9a152b9..d3ccfa558296508c7efea20759df8abdcbe779df:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 1c9250255..75f3e609d 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] } } }, @@ -99,7 +99,7 @@ default_attributes( :master => { :repository => "git://git.openstreetmap.org/rails.git", :revision => "master", - :aliases => [ "api06.dev.openstreetmap.org" ] + :aliases => ["api06.dev.openstreetmap.org"] }, :routing => { :repository => "git://github.com/apmon/openstreetmap-website.git", @@ -111,7 +111,7 @@ default_attributes( }, :owl => { :repository => "git://github.com/ppawel/openstreetmap-website.git", - :revision => "owl-history-tab" + :revision => "owl-activity-tab" }, :groups => { :repository => "git://github.com/osmlab/openstreetmap-website.git", @@ -128,15 +128,11 @@ default_attributes( :comments => { :repository => "git://github.com/ukasiu/openstreetmap-website.git", :revision => "comments_list" - }, - :rails42 => { - :repository => "git://github.com/tomhughes/openstreetmap-website.git", - :revision => "rails42" } } }, :postgresql => { - :versions => [ "9.1", "9.3" ], + :versions => ["9.1", "9.3"], :settings => { :defaults => { :shared_buffers => "1GB", @@ -156,7 +152,7 @@ default_attributes( :sysctl => { :postgres => { :comment => "Increase shared memory for postgres", - :parameters => { + :parameters => { "kernel.shmall" => "4194304", "kernel.shmmax" => "17179869184" }