Merge remote-tracking branch 'github/pull/202'

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 2f09630ab243a01f1b94e6e97fcd2476d4a428fa..264a33b6545a02b79a5cbc4beaf5e966157ebe67 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -101,7 +101,7 @@ default_attributes(
   :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"]
       },
@@ -109,21 +109,19 @@ 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"
-      },
       :comments => {
         :repository => "git://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       },
-      :moderation => {
-        :repository => "git://github.com/gravitystorm/openstreetmap-website.git",
-        :revision => "moderation"
-      },
       :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"
       }
     }
   },