Send changeset uploads to cgimap for dev apis

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 9522ed62f4981426bb2a45404bde57cec8ae341e..eee03b9b6b65aaf249230033ef604cef322448f4 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -92,7 +92,7 @@ default_attributes(
       :server_limit => 32,
       :max_request_workers => 800,
       :threads_per_child => 50,
       :server_limit => 32,
       :max_request_workers => 800,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000

     }
   },
   :apt => {
     }
   },
   :apt => {


@@ -101,7 +101,7 @@ default_attributes(
   :dev => {
     :rails => {
       :master => {
   :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"]
       },
         :revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },


@@ -113,21 +113,19 @@ default_attributes(
         :repository => "git://github.com/ppawel/openstreetmap-website.git",
         :revision => "owl-activity-tab"
       },
         :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"
       },
       :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"
       :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"

       }
     }
   },
       }
     }
   },