X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d7e14243b1f2d6e63ea5d6bad5f6578844ac705c..b25f46122ff7e9092ec9fb2e88ad15c564155c5e:/roles/web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 7ef592fcb..5221de62d 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -4,6 +4,12 @@ description "Role applied to all web/api frontend servers"
 default_attributes(
   :apache => {
     :mpm => "event",
+    :evasive => {
+      :page_count => 100,
+      :site_count => 100,
+      :blocking_period => 30,
+      :enable => false
+    },
     :event => {
       :server_limit => 20,
       :max_request_workers => 1000,
@@ -24,6 +30,11 @@ default_attributes(
   :memcached => {
     :memory_limit => 8192
   },
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:5/sec:30"
+    }
+  },
   :passenger => {
     :max_pool_size => 50
   },
@@ -33,7 +44,8 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :command => "/usr/local/bin/deliver-message $local_part",
+        :local_parts => ["${lookup{$local_part}lsearch*,ret=key{/etc/exim4/detaint}}"],
+        :command => "/usr/local/bin/deliver-message $local_part_data",
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",