X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..d563d6a7df8c6b5006bcf6eed7b53c4da290c785:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 52f8dc7de..bb50ebd29 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -64,6 +64,8 @@ default_attributes(
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
+      :dodobas => { :status => :user },
+      :mhohmann => { :status => :user },
       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 
@@ -94,23 +96,17 @@ default_attributes(
   },
   :apt => {
     :sources => [
-      "brightbox-ruby-ng",
-      "ubuntugis-stable", "ubuntugis-unstable",
+      "ubuntugis-stable",
       "mapnik-v210"
     ]
   },
   :dev => {
-    :ruby => "1.9.1",
     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
         :revision => "master",
         :aliases => [ "api06.dev.openstreetmap.org" ]
       },
-      :forms => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "forms"
-      },
       :routing => {
         :repository => "git://github.com/apmon/openstreetmap-website.git",
         :revision => "routing2"
@@ -126,11 +122,31 @@ default_attributes(
       :overpass => {
         :repository => "git://github.com/drolbr/openstreetmap-website.git",
         :revision => "master"
+      },
+      :groups => {
+        :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"
+      },
+      :overpass2 => {
+        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "overpass"
+      },
+      :comments => {
+        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :revision => "changeset_comments_pr"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => [ "9.1", "9.3" ],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -141,6 +157,9 @@ default_attributes(
       },
       "9.1" => {
         :port => "5433"
+      },
+      "9.3" => {
+        :port => "5432"
       }
     }
   },