X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d6577fc4c50eae4f698f176a8bc1b53996241627..a48d3c6dbc350bfb430691dbc128ff06ad8f979a:/roles/planet.rb

diff --git a/roles/planet.rb b/roles/planet.rb
index 4c2045388..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 => :role,
-        :members => [ :bretth ]
-      }
-    }
-  },
   :rsyncd => {
     :modules => {
       :planet => {
@@ -22,27 +13,35 @@ default_attributes(
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,
-        :exclude => [ ".*" ],
+        :exclude => [".*"],
         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,
-        :refuse_options => [ "checksum" ]
+        :refuse_options => ["checksum"]
       }
     }
   },
+  :networking => {
+    :firewall => {
+      :http_connection_limit => 10
+    }
+  },
   :apache => {
-    :mpm => "event",
-    :keepalive => false,
-    :event => {
+    :mpm => "worker",
+    :keepalive => true,
+    :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]",