Drop unused letsencrypt intermediate

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 38aa6cd5ce2b184072b9a4b8d0c97d41c55e6e39..21f6ea8a49d49452743140d31a9131d810cd21f2 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apache => {
     }
   },
   :apache => {

-    :mpm => "prefork",
+    :mpm => "event",

     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,


@@ -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 => {


@@ -51,8 +48,6 @@ default_attributes(
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",
         :max_connections => "200",
         :innodb_buffer_pool_size => "4G",
         :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"
       }