Switch bytemark servers to use katla for readonly queries

[chef.git] / roles / web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 974ef3b803e2650dd64fd3472ce43ef15f29828c..4d82bd4f65c4fafa482a7cd50a90441336429ccd 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -5,12 +5,12 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
-      :server_limit => 40,
-      :max_clients => 1000,
-      :min_spare_threads => 50,
-      :max_spare_threads => 150,
+      :server_limit => 20,
+      :max_request_workers => 1000,
       :threads_per_child => 50,
-      :max_requests_per_child => 10000
+      :min_spare_threads => 50,
+      :max_spare_threads => 450,
+      :async_request_worker_factor => 4
     }
   },
   :logstash => {
@@ -31,7 +31,7 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
+        :command => "/usr/local/bin/passenger-ruby /srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",