Remove civicrm-staging and role

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 057131b914846f3fa7a9d4c771cd0f06551563d2..c4783f78c2e8453c6f7bea88790382afa5c6324b 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,7 +18,7 @@ default_attributes(
     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {

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

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


@@ -37,11 +37,19 @@ 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 => {
   :mysql => {
     :settings => {
       :mysqld => {