X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..f66588e69a4d002cc2a02ee78bd47515bb409970:/roles/planet.rb

diff --git a/roles/planet.rb b/roles/planet.rb
index d68bdabc3..9055e1efd 100644
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -2,15 +2,6 @@ name "planet"
 description "Role applied to all planet servers"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :bretth => { :status => :user },
-      :planet => {
-        :status => :administrator,
-        :members => [:bretth]
-      }
-    }
-  },
   :rsyncd => {
     :modules => {
       :planet => {
@@ -31,18 +22,26 @@ default_attributes(
       }
     }
   },
+  :networking => {
+    :firewall => {
+      :http_connection_limit => 10
+    }
+  },
   :apache => {
-    :mpm => "event",
+    :mpm => "worker",
     :keepalive => true,
-    :event => {
+    :worker => {
       :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(
+  "role[web-db]",
   "recipe[planet]",
   "recipe[planet::replication]",
   "recipe[nfs::server]",