X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/47a76e5ddfe6e81a23a1cc588a2fc9d467c687fd..4faeeb1a312b83dd41b59c6d084039ee9c235cdb:/roles/dev.rb diff --git a/roles/dev.rb b/roles/dev.rb index 21a4b159f..07dfdd940 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -66,6 +66,7 @@ default_attributes( :dodobas => { :status => :user }, :mhohmann => { :status => :user }, :enelson => { :status => :user }, + :gregrs => { :status => :user }, :ooc => { :status => :role, :members => [:tomh, :blackadder, :timsc, :ollie] @@ -94,6 +95,9 @@ default_attributes( :max_requests_per_child => 10000 } }, + :apt => { + :sources => ["postgresql"] + }, :dev => { :rails => { :master => { @@ -120,14 +124,15 @@ default_attributes( :moderation => { :repository => "git://github.com/sbagroy986/openstreetmap-website.git", :revision => "moderation_queue" + }, + :locale => { + :repository => "git://github.com/tomhughes/openstreetmap-website.git", + :revision => "locale" } } }, - :passenger => { - :ruby_version => "2.1" - }, :postgresql => { - :versions => ["9.1", "9.3"], + :versions => ["9.1", "9.5"], :settings => { :defaults => { :shared_buffers => "1GB", @@ -139,7 +144,7 @@ default_attributes( "9.1" => { :port => "5433" }, - "9.3" => { + "9.5" => { :port => "5432" } }