X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1ebbb9ef31e7495b255b828fcf8ea9ff988b1396..5b4f815f6cd8433be1d66b8376b71452f974b225:/roles/wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index e9f3cb865..38aa6cd5c 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,11 +7,37 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
+  :apache => {
+    :mpm => "prefork",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_request_workers => 800,
+      :threads_per_child => 50,
+      :max_connections_per_child => 10000
+    }
+  },
+  :elasticsearch => {
+    :version => "2.x",
+    :cluster => {
+      :name => "wiki"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
+  },
   :exim => {
-    :trusted_users => [ "www-data" ],
+    :trusted_users => ["www-data"],
     :aliases => {
       :root => "grant"
-    }
+    },
+    :rewrites => [
+      {
+        :pattern => "www-data@openstreetmap.org",
+        :replacement => "wiki@noreply.openstreetmap.org",
+        :flags => "F"
+      }
+    ]
   },
   :memcached => {
     :memory_limit => 1024,
@@ -19,19 +45,22 @@ default_attributes(
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
   },
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_clients => 800,
-      :threads_per_child => 50,
-      :max_requests_per_child => 10000
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :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"
+      }
     }
   }
 )
 
 run_list(
-  "recipe[elasticsearch]",
+  "role[elasticsearch]",
   "recipe[wiki]"
 )