X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ddc3ef7fe89b9e5773d82f129931ed374a19f5d5..e0ae732703cef05e40ba41513cb9070c661cb5bc:/roles/wiki.rb?ds=sidebyside

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 0446cca06..e6d4564e7 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,11 +7,26 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
+  :elasticsearch => {
+    :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,
@@ -32,5 +47,6 @@ default_attributes(
 )
 
 run_list(
+  "role[elasticsearch]",
   "recipe[wiki]"
 )