Bump kitchen-dokken from 2.10.0 to 2.11.0

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 971a51b3744ed636d83f971cc97e8a56c8bf2fb3..2a316491a07e6cbe1c37a54e90eb8fd3fdecae38 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -5,28 +5,30 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
   :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,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :min_spare_threads => 50,
+      :max_spare_threads => 450,
+      :async_request_worker_factor => 4

     }
   },
   :logstash => {
     :forwarder => {
     }
   },
   :logstash => {
     :forwarder => {

-      :files => [
-        { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } },
-        { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } }
+      "filebeat.prospectors" => [
+        { "input_type" => "log", "paths" => ["/var/log/apache2/access.log"], "fields" => { "type" => "apache" } },
+        { "input_type" => "log", "paths" => ["/var/log/web/rails-logstash.log"], "fields" => { "type" => "rails" } }

       ]
     }
   },
       ]
     }
   },

+  :memcached => {
+    :memory_limit => 4096
+  },

   :passenger => {
     :max_pool_size => 50
   },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
   :passenger => {
     :max_pool_size => 50
   },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],

-    :trusted_users => ["rails"],

     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",


@@ -35,7 +37,10 @@ default_attributes(
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",

-        :path => "/bin:/usr/bin:/usr/local/bin"
+        :path => "/bin:/usr/bin:/usr/local/bin",
+        :environment => {
+          "RAILS_ENV" => "production"
+        }

       }
     }
   }
       }
     }
   }