X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/82ffabf3d4fe53e6eed6f01e787f7e2af4594146..5590b3f75c6af03c2d4a1bd00a0028f467738f4a:/roles/dev.rb?ds=sidebyside

diff --git a/roles/dev.rb b/roles/dev.rb
index 278e841f6..a30d18f3c 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -65,6 +65,7 @@ default_attributes(
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
+      :mhohmann => { :status => :user },
       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 
@@ -95,13 +96,11 @@ default_attributes(
   },
   :apt => {
     :sources => [
-      "brightbox-ruby-ng",
       "ubuntugis-stable",
       "mapnik-v210"
     ]
   },
   :dev => {
-    :ruby => "1.9.1",
     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
@@ -120,22 +119,22 @@ default_attributes(
         :repository => "git://github.com/ppawel/openstreetmap-website.git",
         :revision => "owl-history-tab"
       },
-      :overpass => {
-        :repository => "git://github.com/drolbr/openstreetmap-website.git",
-        :revision => "master"
-      },
       :groups => {
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       },
-      :help => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "help-page"
+      :jsrouting => {
+        :repository => "git://github.com/systemed/openstreetmap-website.git",
+        :revision => "routing"
+      },
+      :jsrouting2 => {
+        :repository => "git://github.com/jfirebaugh/openstreetmap-website.git",
+        :revision => "routing"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => [ "9.1", "9.3" ],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -146,6 +145,9 @@ default_attributes(
       },
       "9.1" => {
         :port => "5433"
+      },
+      "9.3" => {
+        :port => "5432"
       }
     }
   },