Upgrade everything except ridley and ouroboros to chef 12

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index fded35d67cfe24d8a8851cf78fe0f07121ea800f..4a775325a47e1ece599196f16c047a1909dff0df 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,13 +8,20 @@ default_attributes(
     }
   },
   :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 => 512,
+    :memory_limit => 1024,
     :connection_limit => 8192,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
@@ -32,5 +39,6 @@ default_attributes(
 )
 
 run_list(
+  "recipe[elasticsearch]",
   "recipe[wiki]"
 )