Revert "Temporary nginx cache purge after depth change"

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index edb21ab291abd69d798edc7f64c423e2be926c29..845f99fe269b6d13cdf0cfc9567486725ac40557 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,12 +18,9 @@ default_attributes(
     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {

-    :version => "2.x",
+    :version => "5.x",

     :cluster => {
       :name => "wiki"
     :cluster => {
       :name => "wiki"

-    },
-    :script => {
-      :disable_dynamic => false

     }
   },
   :exim => {
     }
   },
   :exim => {


@@ -52,6 +49,7 @@ default_attributes(
         :key_buffer_size => "64M",
         :max_connections => "200",
         :query_cache_size => "256M",
         :key_buffer_size => "64M",
         :max_connections => "200",
         :query_cache_size => "256M",

+        :query_cache_type => "1",

         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }
         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }