tilecache: block clustrmaps.com referer

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index edb21ab291abd69d798edc7f64c423e2be926c29..acd0cef1c56f60c7c10322b7f4961c609cd47047 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,22 +8,12 @@ default_attributes(
     }
   },
   :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_request_workers => 800,
-      :threads_per_child => 50,
-      :max_connections_per_child => 10000
-    }
+    :timeout => 30
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "5.x",
     :cluster => {
       :name => "wiki"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :exim => {
@@ -52,6 +42,7 @@ default_attributes(
         :key_buffer_size => "64M",
         :max_connections => "200",
         :query_cache_size => "256M",
+        :query_cache_type => "1",
         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }