Revert "nominatim: disable redirects to poldi"

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 52f8dc7de4aa479ee89f2de6829f24c46f826fc1..21a4b159f62fcc57c8cbc5da8691fb70b79eab69 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 },
       :tomchance => { :status => :user },
       :lfrancke => { :status => :user },
       :davidearl => { :status => :user },

-      :emacsen => { :status => :user },

       :rweait => { :status => :user },
       :ant => { :status => :user },
       :milliams => { :status => :user },
       :rweait => { :status => :user },
       :ant => { :status => :user },
       :milliams => { :status => :user },


@@ -64,21 +63,24 @@ default_attributes(
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },

-      :ooc => { 
-        :status => :role, 
-        :members => [ :tomh, :blackadder, :timsc, :ollie ] 
+      :dodobas => { :status => :user },
+      :mhohmann => { :status => :user },
+      :enelson => { :status => :user },
+      :ooc => {
+        :status => :role,
+        :members => [:tomh, :blackadder, :timsc, :ollie]

       },
       },

-      :apis => { 
-        :status => :role, 
-        :members => [ :tomh ] 
+      :apis => {
+        :status => :role,
+        :members => [:tomh]

       },
       },

-      :os => { 
-        :status => :role, 
-        :members => [ :tomh, :grant, :ollie ] 
+      :os => {
+        :status => :role,
+        :members => [:tomh, :grant, :ollie]

       },
       },

-      :gpsmid => { 
-        :status => :role, 
-        :members => [ :apmon, :maba ] 
+      :gpsmid => {
+        :status => :role,
+        :members => [:apmon, :maba]

       }
     }
   },
       }
     }
   },


@@ -92,28 +94,12 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
       :max_requests_per_child => 10000
     }
   },

-  :apt => {
-    :sources => [
-      "brightbox-ruby-ng",
-      "ubuntugis-stable", "ubuntugis-unstable",
-      "mapnik-v210"
-    ]
-  },

   :dev => {
   :dev => {

-    :ruby => "1.9.1",

     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
         :revision => "master",
     :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"
+        :aliases => ["api06.dev.openstreetmap.org"]

       },
       :tomh => {
         :repository => "git://github.com/tomhughes/openstreetmap-website.git",
       },
       :tomh => {
         :repository => "git://github.com/tomhughes/openstreetmap-website.git",


@@ -121,16 +107,27 @@ default_attributes(
       },
       :owl => {
         :repository => "git://github.com/ppawel/openstreetmap-website.git",
       },
       :owl => {
         :repository => "git://github.com/ppawel/openstreetmap-website.git",

-        :revision => "owl-history-tab"
+        :revision => "owl-activity-tab"

       },
       },

-      :overpass => {
-        :repository => "git://github.com/drolbr/openstreetmap-website.git",
-        :revision => "master"
+      :groups => {
+        :repository => "git://github.com/osmlab/openstreetmap-website.git",
+        :revision => "groups-sketch"
+      },
+      :comments => {
+        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :revision => "comments_list"
+      },
+      :moderation => {
+        :repository => "git://github.com/sbagroy986/openstreetmap-website.git",
+        :revision => "moderation_queue"

       }
     }
   },
       }
     }
   },

+  :passenger => {
+    :ruby_version => "2.1"
+  },

   :postgresql => {
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1", "9.3"],

     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",


@@ -141,13 +138,16 @@ default_attributes(
       },
       "9.1" => {
         :port => "5433"
       },
       "9.1" => {
         :port => "5433"

+      },
+      "9.3" => {
+        :port => "5432"

       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

-      :parameters => { 
+      :parameters => {

         "kernel.shmall" => "4194304",
         "kernel.shmmax" => "17179869184"
       }
         "kernel.shmall" => "4194304",
         "kernel.shmmax" => "17179869184"
       }