imagery: add remainder of os_sv_diff

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 0446cca06be5c6f7e5d326af9fc0cd720ae9c8ea..e6d4564e7a504e3984180d5e930de885b6b2b0ca 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,


@@ -32,5 +47,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

+  "role[elasticsearch]",

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