Use systemd-resolved stub resolver for nginx resolver

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index b663084260d014dcd547331a46902994bd45cdc7..17b5c4726072897a5a0a114ca31cce6452c4d8b3 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -103,16 +103,14 @@ default_attributes(
       :master => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
       :master => {
         :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"
       },
         :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"
-      },

       :comments => {
         :repository => "git://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       :comments => {
         :repository => "git://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"


@@ -120,6 +118,12 @@ default_attributes(
       :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"

       }
     }
   },
       }
     }
   },