X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6ae3dbf336935b1c0ab10ebe1ac27abc590b8a73..8d616c2fff62ae56d1f491c563c1ee0368178fe6:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 57013c971..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,21 +65,23 @@ default_attributes(
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :mhohmann => { :status => :user },
-      :ooc => { 
-        :status => :role, 
-        :members => [ :tomh, :blackadder, :timsc, :ollie ] 
+      :enelson => { :status => :user },
+      :gregrs => { :status => :user },
+      :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]
       }
     }
   },
@@ -89,64 +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 => [
-      "ubuntugis-stable",
-      "mapnik-v210"
-    ]
+    :sources => ["postgresql"]
   },
   :dev => {
     :rails => {
       :master => {
-        :repository => "git://git.openstreetmap.org/rails.git",
+        :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
-        :aliases => [ "api06.dev.openstreetmap.org" ]
-      },
-      :routing => {
-        :repository => "git://github.com/apmon/openstreetmap-website.git",
-        :revision => "routing2"
+        :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-history-tab"
-      },
-      :overpass => {
-        :repository => "git://github.com/drolbr/openstreetmap-website.git",
-        :revision => "master"
-      },
-      :groups => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "groups-sketch"
-      },
-      :jsrouting => {
-        :repository => "git://github.com/systemed/openstreetmap-website.git",
-        :revision => "routing"
-      },
-      :jsrouting2 => {
-        :repository => "git://github.com/jfirebaugh/openstreetmap-website.git",
-        :revision => "routing"
+      :comments => {
+        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :revision => "comments_list"
       },
-      :overpass2 => {
+      :locale => {
         :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "overpass"
+        :revision => "locale"
       },
-      :comments => {
-        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
-        :revision => "changeset_comments"
+      :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" ],
+    :versions => ["9.1", "9.5"],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -157,13 +139,16 @@ default_attributes(
       },
       "9.1" => {
         :port => "5433"
+      },
+      "9.5" => {
+        :port => "5432"
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmall" => "4194304",
         "kernel.shmmax" => "17179869184"
       }