mediawiki: Increase timeout for mediawiki-refresh-links again

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 2a316491a07e6cbe1c37a54e90eb8fd3fdecae38..985811f59b972d45ffef1bf0067ff712f5d51c99 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -15,14 +15,14 @@ default_attributes(
   },
   :logstash => {
     :forwarder => {
-      "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" } }
+      "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 => 4096
+    :memory_limit => 8192
   },
   :passenger => {
     :max_pool_size => 50
@@ -33,14 +33,11 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :command => "/usr/local/bin/passenger-ruby /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",
-        :path => "/bin:/usr/bin:/usr/local/bin",
-        :environment => {
-          "RAILS_ENV" => "production"
-        }
+        :path => "/bin:/usr/bin:/usr/local/bin"
       }
     }
   }