Stop fight chef-server over configuration file permissions

[chef.git] / roles / planet.rb

diff --git a/roles/planet.rb b/roles/planet.rb
index d68bdabc3ac589e6c041bc9506308133bd6b2dfe..889f0bb0e90df79836e185a6e4b92e78a55088a3 100644 (file)
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -31,18 +31,26 @@ default_attributes(
       }
     }
   },
       }
     }
   },

+  :networking => {
+    :firewall => {
+      :http_connection_limit => 10
+    }
+  },

   :apache => {
   :apache => {

-    :mpm => "event",
+    :mpm => "worker",

     :keepalive => true,
     :event => {
       :server_limit => 20,
     :keepalive => true,
     :event => {
       :server_limit => 20,

-      :max_clients => 1000,
-      :threads_per_child => 50
+      :max_request_workers => 1000,
+      :threads_per_child => 50,
+      :min_spare_threads => 75,
+      :max_spare_threads => 525

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

+  "role[web-db]",

   "recipe[planet]",
   "recipe[planet::replication]",
   "recipe[nfs::server]",
   "recipe[planet]",
   "recipe[planet::replication]",
   "recipe[nfs::server]",