Remove mapnik-v210 and ubuntugis-unstable repos from dev

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 947c6f54c6e3804180df9a74edfded861ace015c..0a9b76f28c561cb2263a6f25fc1f12a067a9cc80 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -94,12 +94,6 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
-  :apt => {
-    :sources => [
-      "ubuntugis-stable",
-      "mapnik-v210"
-    ]
-  },
   :dev => {
     :rails => {
       :master => {
@@ -119,10 +113,6 @@ 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"
@@ -134,26 +124,11 @@ default_attributes(
       :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"
-      },
-      :rails41 => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails41"
       }
     }
   },
-  :passenger => {
-    :version => "4.0.45"
-  },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => [ "9.1", "9.3" ],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -164,6 +139,9 @@ default_attributes(
       },
       "9.1" => {
         :port => "5433"
+      },
+      "9.3" => {
+        :port => "5432"
       }
     }
   },