Add new Equinix addresses to Dublin hosts

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 2549e98dc1d4aa4dfbe344788117a16e6ce413f8..396cf36dbeddd5a18aeb90b70aa74e6d9ea98eb4 100644 (file)
--- 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",
 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,
     :event => {
       :server_limit => 20,
       :max_request_workers => 1000,


@@ -13,14 +19,6 @@ default_attributes(
       :async_request_worker_factor => 4
     }
   },
       :async_request_worker_factor => 4
     }
   },

-  :logstash => {
-    :forwarder => {
-      "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 => 8192
   },
   :memcached => {
     :memory_limit => 8192
   },


@@ -38,7 +36,8 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
       :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",
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",


@@ -51,6 +50,5 @@ default_attributes(
 
 run_list(
   "role[web]",
 
 run_list(
   "role[web]",

-  "role[logstash-forwarder]",

   "recipe[web::frontend]"
 )
   "recipe[web::frontend]"
 )