Switch to planet-dump-ng 1.2.4 for Ubuntu 22.04 compatibility

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 5ad10684756cd122f9bc4cf20185226ea56b960c..2a316491a07e6cbe1c37a54e90eb8fd3fdecae38 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -10,24 +10,25 @@ default_attributes(
       :threads_per_child => 50,
       :min_spare_threads => 50,
       :max_spare_threads => 450,
       :threads_per_child => 50,
       :min_spare_threads => 50,
       :max_spare_threads => 450,

-      :max_connections_per_child => 10000,

       :async_request_worker_factor => 4
     }
   },
   :logstash => {
     :forwarder => {
       :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.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",


@@ -36,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"
+        }

       }
     }
   }
       }
     }
   }