Remove last traces of legacy certificate support

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index e9f3cb8650a6fbb7e4e3a95fedd7269f2fc2acd9..9298395afb272362099d8b3baaa92baa091a79e2 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,11 +7,26 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
       :wiki => { :status => :role }
     }
   },

+  :elasticsearch => {
+    :cluster => {
+      :name => "wiki"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
+  },

   :exim => {
   :exim => {

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

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

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

   },
   :memcached => {
     :memory_limit => 1024,
   },
   :memcached => {
     :memory_limit => 1024,


@@ -24,14 +39,14 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_request_workers => 800,

       :threads_per_child => 50,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

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

   "recipe[wiki]"
 )
   "recipe[wiki]"
 )