X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a92c80c41d88faa20123f2841cc335c37905f638..37306271bf3cec2ea3efd3f51d6da7dbc68d950a:/roles/web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index e228e0efc..985811f59 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -5,36 +5,39 @@ 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 => {
     :forwarder => {
-      :files => [
-        { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } },
-        { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } }
+      "filebeat.inputs" => [
+        { "type" => "filestream", "id" => "apache", "paths" => ["/var/log/apache2/access.log"], "fields" => { "type" => "apache" }, "fields_under_root" => true },
+        { "type" => "filestream", "id" => "rails", "paths" => ["/var/log/web/rails-logstash.log"], "fields" => { "type" => "rails" }, "fields_under_root" => true }
       ]
     }
   },
+  :memcached => {
+    :memory_limit => 8192
+  },
   :passenger => {
     :max_pool_size => 50
   },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
-    :trusted_users => ["rails"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
+        :command => "/usr/local/bin/deliver-message $local_part",
         :user => "rails",
         :group => "rails",
-        :home_directory => "/srv/www.openstreetmap.org/rails"
+        :home_directory => "/srv/www.openstreetmap.org/rails",
+        :path => "/bin:/usr/bin:/usr/local/bin"
       }
     }
   }