X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a39cecef13fff013c1aa08a2db444ce0eed8a05f..a2cc61fc04a3f25bd5bb5d64ffa5fceca252c4a3:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index aa07120ee..17b5c4726 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -43,7 +43,6 @@ default_attributes(
       :tomchance => { :status => :user },
       :lfrancke => { :status => :user },
       :davidearl => { :status => :user },
-      :emacsen => { :status => :user },
       :rweait => { :status => :user },
       :ant => { :status => :user },
       :milliams => { :status => :user },
@@ -66,6 +65,8 @@ default_attributes(
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :mhohmann => { :status => :user },
+      :enelson => { :status => :user },
+      :gregrs => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -89,38 +90,45 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
-      :max_clients => 800,
+      :max_request_workers => 800,
       :threads_per_child => 50,
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   },
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :dev => {
     :rails => {
       :master => {
-        :repository => "git://git.openstreetmap.org/rails.git",
+        :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
+        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },
       :tomh => {
         :repository => "git://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next"
       },
-      :owl => {
-        :repository => "git://github.com/ppawel/openstreetmap-website.git",
-        :revision => "owl-activity-tab"
-      },
-      :groups => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "groups-sketch"
-      },
       :comments => {
         :repository => "git://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
+      },
+      :locale => {
+        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "locale"
+      },
+      :upload => {
+        :repository => "https://git.openstreetmap.org/public/rails.git",
+        :revision => "master",
+        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "feature/bulk_upload"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.1", "9.3"],
+    :versions => ["9.1", "9.5"],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -132,7 +140,7 @@ default_attributes(
       "9.1" => {
         :port => "5433"
       },
-      "9.3" => {
+      "9.5" => {
         :port => "5432"
       }
     }