vectortile: make enabled a boolean

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 503ad95fa32f8b3032997c883e0e41b5d0b9c4eb..e7c0e5850f171bebce1dadc49d154fa4e84f1970 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -7,7 +7,8 @@ default_attributes(
     :evasive => {
       :page_count => 100,
       :site_count => 100,
-      :blocking_period => 30
+      :blocking_period => 30,
+      :enable => false
     },
     :event => {
       :server_limit => 20,
@@ -18,14 +19,6 @@ default_attributes(
       :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
   },
@@ -37,6 +30,9 @@ default_attributes(
   :passenger => {
     :max_pool_size => 50
   },
+  :ruby => {
+    :fullstaq => true
+  },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
     :routes => {
@@ -57,6 +53,5 @@ default_attributes(
 
 run_list(
   "role[web]",
-  "role[logstash-forwarder]",
   "recipe[web::frontend]"
 )