Stop fight chef-server over configuration file permissions

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index cb7c62500c9a40da6ffdbb8ff715a0798dc503e2..928d706760de15bf55472943cf050814e6ab7de5 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -90,9 +90,9 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_request_workers => 800,

       :threads_per_child => 50,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000

     }
   },
   :apt => {
     }
   },
   :apt => {


@@ -132,7 +132,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

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

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


@@ -144,7 +144,7 @@ default_attributes(
       "9.1" => {
         :port => "5433"
       },
       "9.1" => {
         :port => "5433"
       },

-      "9.3" => {
+      "9.5" => {

         :port => "5432"
       }
     }
         :port => "5432"
       }
     }