X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/720dcf829378305b21bfde8f1b23e6827145973f..dda5eb79cd636b6acc51e86704d627ffa2f55f6d:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 373b1c18c..264a33b65 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -90,15 +90,18 @@ 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",
         :aliases => ["api06.dev.openstreetmap.org"]
       },
@@ -106,30 +109,24 @@ default_attributes(
         :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"
       },
-      :moderation => {
-        :repository => "git://github.com/sbagroy986/openstreetmap-website.git",
-        :revision => "moderation_queue"
-      },
       :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",
@@ -141,7 +138,7 @@ default_attributes(
       "9.1" => {
         :port => "5433"
       },
-      "9.3" => {
+      "9.5" => {
         :port => "5432"
       }
     }