Load nct6775 sensor module on vial

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 84ca09be9f3895c24823f2d3fb64f7269bea43f6..6f49fae6d3a56d67d6c1bac83ff07ac0158dde82 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,21 +65,23 @@ default_attributes(
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :mhohmann => { :status => :user },
+      :enelson => { :status => :user },
+      :gregrs => { :status => :user },
       :ooc => {
         :status => :role,
-        :members => [ :tomh, :blackadder, :timsc, :ollie ]
+        :members => [:tomh, :blackadder, :timsc, :ollie]
       },
       :apis => {
         :status => :role,
-        :members => [ :tomh ]
+        :members => [:tomh]
       },
       :os => {
         :status => :role,
-        :members => [ :tomh, :grant, :ollie ]
+        :members => [:tomh, :grant, :ollie]
       },
       :gpsmid => {
         :status => :role,
-        :members => [ :apmon, :maba ]
+        :members => [:apmon, :maba]
       }
     }
   },
@@ -89,21 +90,20 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
-      :max_clients => 800,
+      :max_request_workers => 800,
       :threads_per_child => 50,
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   },
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :dev => {
     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
         :revision => "master",
-        :aliases => [ "api06.dev.openstreetmap.org" ]
-      },
-      :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",
@@ -113,26 +113,22 @@ default_attributes(
         :repository => "git://github.com/ppawel/openstreetmap-website.git",
         :revision => "owl-activity-tab"
       },
-      :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"
-      },
       :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"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1", "9.3" ],
+    :versions => ["9.1", "9.5"],
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
@@ -144,7 +140,7 @@ default_attributes(
       "9.1" => {
         :port => "5433"
       },
-      "9.3" => {
+      "9.5" => {
         :port => "5432"
       }
     }