X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e66dcd5543527ec3aa86cbf36823e6473f48b2fe..13ef9975b5d6b159207273e971cf614477c793ca:/roles/web-frontend.rb?ds=sidebyside

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 2549e98dc..8e8fa817d 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -4,6 +4,11 @@ description "Role applied to all web/api frontend servers"
 default_attributes(
   :apache => {
     :mpm => "event",
+    :evasive => {
+      :page_count => 30,
+      :site_count => 100,
+      :blocking_period => 30
+    },
     :event => {
       :server_limit => 20,
       :max_request_workers => 1000,
@@ -38,7 +43,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",