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

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 75f3e609ddc85368ed85a7e58c5953adcff8c179..b3c0d4eb0b4042d52fa7f4010de92f180fb5eebd 100644 (file)
--- 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,6 +65,7 @@ default_attributes(
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :mhohmann => { :status => :user },
+      :enelson => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -101,10 +101,6 @@ default_attributes(
         :revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },
-      :routing => {
-        :repository => "git://github.com/apmon/openstreetmap-website.git",
-        :revision => "routing2"
-      },
       :tomh => {
         :repository => "git://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next"
@@ -117,17 +113,17 @@ default_attributes(
         :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"
+      },
+      :moderation => {
+        :repository => "git://github.com/sbagroy986/openstreetmap-website.git",
+        :revision => "moderation_queue"
+      },
+      :locale => {
+        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "locale"
       }
     }
   },