Use backports for smartmontools on debian

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 057131b914846f3fa7a9d4c771cd0f06551563d2..0c83be4c5ed6e4f16c7093e339e46fa66e91c3a7 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -15,10 +15,14 @@ default_attributes(
       :max_request_workers => 800,
       :threads_per_child => 50,
       :max_connections_per_child => 10000
       :max_request_workers => 800,
       :threads_per_child => 50,
       :max_connections_per_child => 10000

+    },
+    :evasive => {
+      :page_count => 250,
+      :site_count => 500

     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {

-    :version => "6.x",
+    :version => "7.x",

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


@@ -37,17 +41,25 @@ default_attributes(
     ]
   },
   :memcached => {
     ]
   },
   :memcached => {

-    :memory_limit => 1024,
+    :memory_limit => 4096,

     :connection_limit => 8192,
     :chunk_growth_factor => 1.25,
     :min_item_size => 48
   },
     :connection_limit => 8192,
     :chunk_growth_factor => 1.25,
     :min_item_size => 48
   },

+  :sysctl => {
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    }
+  },

   :mysql => {
     :settings => {
       :mysqld => {
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",
   :mysql => {
     :settings => {
       :mysqld => {
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",

-        :max_connections => "200",
+        :max_connections => "500",

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