Merge remote-tracking branch 'github/pull/705'

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index b1e16207e00084d5f9b33f451bd15be13bd4488b..0c83be4c5ed6e4f16c7093e339e46fa66e91c3a7 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,22 +7,67 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
       :wiki => { :status => :role }
     }
   },

+  :apache => {
+    :mpm => "event",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_request_workers => 800,
+      :threads_per_child => 50,
+      :max_connections_per_child => 10000
+    },
+    :evasive => {
+      :page_count => 250,
+      :site_count => 500
+    }
+  },
+  :elasticsearch => {
+    :version => "7.x",
+    :cluster => {
+      :name => "wiki"
+    }
+  },

   :exim => {
   :exim => {

-    :trusted_users => [ "www-data" ],
+    :trusted_users => %w[www-data wiki],

     :aliases => {
       :root => "grant"
     :aliases => {
       :root => "grant"

-    }
+    },
+    :rewrites => [
+      {
+        :pattern => "www-data@openstreetmap.org",
+        :replacement => "wiki@noreply.openstreetmap.org",
+        :flags => "F"
+      }
+    ]

   },
   :memcached => {
   },
   :memcached => {

-    :tcp_port => 11000,
-    :udp_port => 11000,
-    :memory_limit => 512,
+    :memory_limit => 4096,

     :connection_limit => 8192,
     :connection_limit => 8192,

-    :chunk_growth_factor => 1.05,
-    :min_item_size => 5
+    :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",
+        :max_connections => "500",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "128M"
+      }
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "recipe[mediawiki]"
+  "role[elasticsearch]",
+  "recipe[wiki]"

 )
 )